From f4cf1d615896c8ea8d9f3906a304a28564e1a2f4 Mon Sep 17 00:00:00 2001
From: Ted John <ted@brambles.org>
Date: Sat, 17 Sep 2016 16:14:46 +0100
Subject: [PATCH] Integrate gUnkF1A4CC

---
 src/interface/viewport.c        | 4 ++--
 src/paint/paint.c               | 1 +
 src/paint/paint.h               | 2 ++
 src/windows/ride_construction.c | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/interface/viewport.c b/src/interface/viewport.c
index 6093820d9f..7055b4889d 100644
--- a/src/interface/viewport.c
+++ b/src/interface/viewport.c
@@ -770,7 +770,7 @@ void viewport_paint(rct_viewport* viewport, rct_drawpixelinfo* dpi, int left, in
 			}
 			gfx_clear(dpi2, colour);
 		}
-		g_ps_EE7880 = RCT2_ADDRESS(0xF1A4CC, paint_struct);
+		g_ps_EE7880 = &gUnkF1A4CC;
 		unk_140E9A8 = dpi2;
 		painter_setup();
 		viewport_paint_setup();
@@ -1399,7 +1399,7 @@ void get_map_coordinates_from_pos(int screenX, int screenY, int flags, sint16 *x
 			dpi->zoom_level = _viewportDpi1.zoom_level;
 			dpi->x = _viewportDpi1.x;
 			dpi->width = 1;
-			g_ps_EE7880 = RCT2_ADDRESS(0xF1A4CC, paint_struct);
+			g_ps_EE7880 = &gUnkF1A4CC;
 			unk_140E9A8 = dpi;
 			painter_setup();
 			viewport_paint_setup();
diff --git a/src/paint/paint.c b/src/paint/paint.c
index c47e38dc22..684988f602 100644
--- a/src/paint/paint.c
+++ b/src/paint/paint.c
@@ -41,6 +41,7 @@ void *g_currently_drawn_item;
 paint_struct * g_ps_EE7880;
 sint16 gUnk9DE568;
 sint16 gUnk9DE56C;
+paint_struct gUnkF1A4CC;
 uint8 gPaintInteractionType;
 support_height gSupportSegments[9] = { 0 };
 support_height gSupport;
diff --git a/src/paint/paint.h b/src/paint/paint.h
index 183ddcb9fd..9c21484aa4 100644
--- a/src/paint/paint.h
+++ b/src/paint/paint.h
@@ -34,11 +34,13 @@ typedef struct paint_struct paint_struct;
 	extern paint_struct * g_ps_EE7880;
 	extern sint16 gUnk9DE568;
 	extern sint16 gUnk9DE56C;
+	extern paint_struct gUnkF1A4CC;
 #else
 	#define g_currently_drawn_item	RCT2_GLOBAL(0x009DE578, void*)
 	#define g_ps_EE7880				RCT2_GLOBAL(0x00EE7880, paint_struct *)
 	#define gUnk9DE568				RCT2_GLOBAL(0x009DE568, sint16)
 	#define gUnk9DE56C				RCT2_GLOBAL(0x009DE56C, sint16)
+	#define gUnkF1A4CC				RCT2_GLOBAL(0x00F1A4CC, paint_struct);
 #endif
 
 #pragma pack(push, 1)
diff --git a/src/windows/ride_construction.c b/src/windows/ride_construction.c
index d833395271..314c4a3f97 100644
--- a/src/windows/ride_construction.c
+++ b/src/windows/ride_construction.c
@@ -2311,7 +2311,7 @@ static void sub_6CBCE2(
 	gCurrentViewportFlags = 0;
 	trackDirection &= 3;
 
-	g_ps_EE7880 = RCT2_ADDRESS(0xF1A4CC, paint_struct);
+	g_ps_EE7880 = &gUnkF1A4CC;
 	painter_setup();
 
 	ride = get_ride(rideIndex);