mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Redirect gTrackColours to gPaintSession

This commit is contained in:
Ted John 2017-09-01 13:06:32 +01:00
parent a0f5f1243f
commit b314cc4d74
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/openrct2/paint/paint.h
View File

@ -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 */

4
src/openrct2/ride/track_paint.c
View File

@ -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)

6
src/openrct2/ride/track_paint.h
View File

@ -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[];