From f81c394c8be6967326408f8ee6be21e22cb98f9f Mon Sep 17 00:00:00 2001
From: Ted John <ted@brambles.org>
Date: Sat, 10 Sep 2016 15:22:14 +0100
Subject: [PATCH] Remove unused variables

---
 src/game.c         | 20 +++++++-------------
 src/windows/ride.c |  6 ++----
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/src/game.c b/src/game.c
index 003cb01262..95c35de511 100644
--- a/src/game.c
+++ b/src/game.c
@@ -295,21 +295,15 @@ void game_update()
 		if (gGameSpeed > 1)
 			continue;
 
-		// Possibly smooths viewport scrolling, I don't see a difference though
-		if (RCT2_GLOBAL(0x009E2D74, uint32) == 1) {
-			RCT2_GLOBAL(0x009E2D74, uint32) = 0;
-			break;
-		} else {
-			if (gInputState == INPUT_STATE_RESET ||
-				gInputState == INPUT_STATE_NORMAL
-			) {
-				if (gInputFlags & INPUT_FLAG_VIEWPORT_SCROLLING) {
-					gInputFlags &= ~INPUT_FLAG_VIEWPORT_SCROLLING;
-					break;
-				}
-			} else {
+		if (gInputState == INPUT_STATE_RESET ||
+			gInputState == INPUT_STATE_NORMAL
+		) {
+			if (gInputFlags & INPUT_FLAG_VIEWPORT_SCROLLING) {
+				gInputFlags &= ~INPUT_FLAG_VIEWPORT_SCROLLING;
 				break;
 			}
+		} else {
+			break;
 		}
 	}
 
diff --git a/src/windows/ride.c b/src/windows/ride.c
index 0fd26071d3..482804d1bb 100644
--- a/src/windows/ride.c
+++ b/src/windows/ride.c
@@ -1922,10 +1922,8 @@ static void window_ride_init_viewport(rct_window *w)
 		w->viewport = 0;
 
 		viewport_update_pointers();
-	}
-	else{
-		if (RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_FLAGS, uint8) & 0x1)
-			viewport_flags |= VIEWPORT_FLAG_GRIDLINES;
+	} else if (gConfigGeneral.always_show_gridlines) {
+		viewport_flags |= VIEWPORT_FLAG_GRIDLINES;
 	}
 
 	window_event_invalidate_call(w);