From d2b3a08739b1cf94c39e8484666c5a55bed1132b Mon Sep 17 00:00:00 2001
From: Ted John <ted@brambles.org>
Date: Sat, 10 Sep 2016 17:55:32 +0100
Subject: [PATCH] Misc cleanup of RCT2_GLOBAL

---
 src/windows/map.c       | 3 +--
 src/windows/ride_list.c | 4 ----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/windows/map.c b/src/windows/map.c
index a23f6b6202..156ab6e217 100644
--- a/src/windows/map.c
+++ b/src/windows/map.c
@@ -14,7 +14,6 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../addresses.h"
 #include "../audio/audio.h"
 #include "../cheats.h"
 #include "../game.h"
@@ -245,7 +244,7 @@ void window_map_open()
 	w->map.rotation = get_current_rotation();
 
 	window_map_init_map();
-	RCT2_GLOBAL(0x00F64F05, uint8) = 0;
+	gWindowSceneryRotation = 0;
 	window_map_center_on_view_point();
 
 	// Reset land tool size
diff --git a/src/windows/ride_list.c b/src/windows/ride_list.c
index e3fa44f492..0ca6b55b6a 100644
--- a/src/windows/ride_list.c
+++ b/src/windows/ride_list.c
@@ -637,14 +637,10 @@ static void window_ride_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi,
 			}
 			break;
 		case INFORMATION_TYPE_RELIABILITY:
-			// edx = RCT2_GLOBAL(0x009ACFA4 + (ride->var_001 * 4), uint32);
-
 			set_format_arg(2, uint16, ride->reliability >> 8);
 			formatSecondary = STR_RELIABILITY_LABEL;
 			break;
 		case INFORMATION_TYPE_DOWN_TIME:
-			// edx = RCT2_GLOBAL(0x009ACFA4 + (ride->var_001 * 4), uint32);
-
 			set_format_arg(2, uint16, ride->downtime);
 			formatSecondary = STR_DOWN_TIME_LABEL;
 			break;