From 69eca489da377d4fc465b5c4eb9ec15453bd32df Mon Sep 17 00:00:00 2001
From: Ted John <ted@brambles.org>
Date: Sat, 17 Sep 2016 14:10:39 +0100
Subject: [PATCH] Integrate gSavedView...

---
 src/interface/viewport.c |  7 ++++---
 src/interface/viewport.h | 11 ++++-------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/interface/viewport.c b/src/interface/viewport.c
index 0d99515296..6093820d9f 100644
--- a/src/interface/viewport.c
+++ b/src/interface/viewport.c
@@ -47,13 +47,14 @@ rct_viewport *g_music_tracking_viewport;
 
 rct_map_element *_interaction_element = NULL;
 
-#ifdef NO_RCT2
-paint_struct *unk_EE7884;
-paint_struct *unk_EE7888;
 sint16 gSavedViewX;
 sint16 gSavedViewY;
 uint8 gSavedViewZoom;
 uint8 gSavedViewRotation;
+
+#ifdef NO_RCT2
+paint_struct *unk_EE7884;
+paint_struct *unk_EE7888;
 uint8 gCurrentRotation;
 uint32 gCurrentViewportFlags = 0;
 #endif
diff --git a/src/interface/viewport.h b/src/interface/viewport.h
index 19c90d9f10..470a343c34 100644
--- a/src/interface/viewport.h
+++ b/src/interface/viewport.h
@@ -99,22 +99,19 @@ extern uint8 gShowConstuctionRightsRefCount;
 // rct2: 0x014234BC
 extern rct_viewport g_viewport_list[MAX_VIEWPORT_COUNT];
 extern rct_viewport *g_music_tracking_viewport;
-#ifdef NO_RCT2
-extern paint_struct *unk_EE7884;
-extern paint_struct *unk_EE7888;
 extern sint16 gSavedViewX;
 extern sint16 gSavedViewY;
 extern uint8 gSavedViewZoom;
 extern uint8 gSavedViewRotation;
+
+#ifdef NO_RCT2
+extern paint_struct *unk_EE7884;
+extern paint_struct *unk_EE7888;
 extern uint8 gCurrentRotation;
 extern uint32 gCurrentViewportFlags;
 #else
 	#define unk_EE7884 RCT2_GLOBAL(0x00EE7884, paint_struct*)
 	#define unk_EE7888 RCT2_GLOBAL(0x00EE7888, paint_struct*)
-	#define gSavedViewX				RCT2_GLOBAL(RCT2_ADDRESS_SAVED_VIEW_X, sint16)
-	#define gSavedViewY				RCT2_GLOBAL(RCT2_ADDRESS_SAVED_VIEW_Y, sint16)
-	#define gSavedViewZoom			RCT2_GLOBAL(RCT2_ADDRESS_SAVED_VIEW_ZOOM, uint8)
-	#define gSavedViewRotation		RCT2_GLOBAL(RCT2_ADDRESS_SAVED_VIEW_ROTATION, uint8)
 	#define gCurrentRotation		RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_ROTATION, uint8)
 	#define gCurrentViewportFlags	RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_VIEWPORT_FLAGS, uint32)
 #endif