From b314cc4d741933adf125fcf8b3ea7a522b21d324 Mon Sep 17 00:00:00 2001
From: Ted John <ted@brambles.org>
Date: Fri, 1 Sep 2017 13:06:32 +0100
Subject: [PATCH] Redirect gTrackColours to gPaintSession

---
 src/openrct2/paint/paint.h      | 6 +++++-
 src/openrct2/ride/track_paint.c | 4 ----
 src/openrct2/ride/track_paint.h | 6 ------
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/openrct2/paint/paint.h b/src/openrct2/paint/paint.h
index 141f6a688e..674059954e 100644
--- a/src/openrct2/paint/paint.h
+++ b/src/openrct2/paint/paint.h
@@ -168,11 +168,14 @@ typedef struct paint_session
     bool                    DidPassSurface;
     uint8                   Unk141E9DB;
     uint16                  Unk141E9DC;
+    uint32                  TrackColours[4];
 } paint_session;
 
 extern paint_session gPaintSession;
 
-#ifndef NO_RCT2
+#ifdef NO_RCT2
+#define gTrackColours               gPaintSession.TrackColours
+#else
 #define gPaintStructs               RCT2_ADDRESS(0x00EE788C, paint_entry)
 #define g_currently_drawn_item      RCT2_GLOBAL(0x009DE578, void*)
 #define gEndOfPaintStructArray      RCT2_GLOBAL(0x00EE7880, paint_entry *)
@@ -191,6 +194,7 @@ extern paint_session gPaintSession;
 #define gDidPassSurface             RCT2_GLOBAL(0x009DE57C, bool)
 #define g141E9DB                    RCT2_GLOBAL(0x0141E9DB, uint8)
 #define gUnk141E9DC                 RCT2_GLOBAL(0x0141E9DC, uint16)
+#define gTrackColours   RCT2_ADDRESS(0x00F44198, uint32)
 #endif
 
 /** rct2: 0x00993CC4 */
diff --git a/src/openrct2/ride/track_paint.c b/src/openrct2/ride/track_paint.c
index 6ccb6c8b76..a09148ff37 100644
--- a/src/openrct2/ride/track_paint.c
+++ b/src/openrct2/ride/track_paint.c
@@ -201,10 +201,6 @@ enum
     SPR_STATION_COVER_OFFSET_TALL
 };
 
-#ifdef NO_RCT2
-uint32 gTrackColours[4];
-#endif
-
 bool gUseOriginalRidePaint = false;
 
 bool track_paint_util_has_fence(enum edge_t edge, rct_xy16 position, rct_map_element * mapElement, rct_ride * ride, uint8 rotation)
diff --git a/src/openrct2/ride/track_paint.h b/src/openrct2/ride/track_paint.h
index e1084c76ed..b796b6a73f 100644
--- a/src/openrct2/ride/track_paint.h
+++ b/src/openrct2/ride/track_paint.h
@@ -224,12 +224,6 @@ enum {
     STATION_VARIANT_TALL,
 };
 
-#ifdef NO_RCT2
-extern uint32 gTrackColours[4];
-#else
-#define gTrackColours   RCT2_ADDRESS(0x00F44198, uint32)
-#endif
-
 extern const uint32 floorSpritesCork[];
 
 extern const uint32 fenceSpritesRope[];