From d794057f8c3d8221c032ee27c93fd9131b8cce80 Mon Sep 17 00:00:00 2001 From: Ted John Date: Fri, 1 Sep 2017 12:39:09 +0100 Subject: [PATCH] Remove gWoodenSupportsPrependTo global --- src/openrct2/paint/map_element/map_element.h | 2 +- src/openrct2/paint/paint.h | 15 ++++++------ src/openrct2/paint/supports.c | 16 +++++-------- src/openrct2/paint/supports.h | 6 ----- .../ride/coaster/heartline_twister_coaster.c | 24 +++++++++---------- .../ride/coaster/mine_train_coaster.c | 12 +++++----- src/openrct2/ride/coaster/virginia_reel.c | 8 +++---- .../ride/coaster/wooden_roller_coaster.c | 6 ++--- src/openrct2/ride/coaster/wooden_wild_mouse.c | 6 ++--- src/openrct2/ride/thrill/go_karts.c | 6 ++--- src/openrct2/ride/water/river_rapids.c | 12 +++++----- src/openrct2/ride/water/splash_boats.c | 6 ++--- 12 files changed, 55 insertions(+), 64 deletions(-) diff --git a/src/openrct2/paint/map_element/map_element.h b/src/openrct2/paint/map_element/map_element.h index 5ff8d9fc42..d78f0d3a2d 100644 --- a/src/openrct2/paint/map_element/map_element.h +++ b/src/openrct2/paint/map_element/map_element.h @@ -96,7 +96,7 @@ extern uint8 gVerticalTunnelHeight; #else #define g141E9DB RCT2_GLOBAL(0x0141E9DB, uint8) #define gUnk141E9DC RCT2_GLOBAL(0x0141E9DC, uint16) -#define gPaintMapPosition RCT2_GLOBAL(0x009DE574, rct_xy16) +#define gPaintMapPosition RCT2_GLOBAL(0x009DE574, rct_xy16) #define gDidPassSurface RCT2_GLOBAL(0x009DE57C, bool) #define gSurfaceElement RCT2_GLOBAL(0x009E3250, rct_map_element *) #define gLeftTunnels RCT2_ADDRESS(0x009E3138, tunnel_entry) diff --git a/src/openrct2/paint/paint.h b/src/openrct2/paint/paint.h index 9bfd514dcc..232c515b00 100644 --- a/src/openrct2/paint/paint.h +++ b/src/openrct2/paint/paint.h @@ -158,13 +158,14 @@ typedef struct paint_session extern paint_session gPaintSession; #ifndef NO_RCT2 -#define gPaintStructs RCT2_ADDRESS(0x00EE788C, paint_entry) -#define g_currently_drawn_item RCT2_GLOBAL(0x009DE578, void*) -#define gEndOfPaintStructArray RCT2_GLOBAL(0x00EE7880, paint_entry *) -#define gPaintSpritePosition RCT2_GLOBAL(0x009DE568, rct_xy16) -#define gPaintInteractionType RCT2_GLOBAL(RCT2_ADDRESS_PAINT_SETUP_CURRENT_TYPE, uint8) -#define gSupportSegments RCT2_ADDRESS(RCT2_ADDRESS_CURRENT_SUPPORT_SEGMENTS, support_height) -#define gSupport RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_PAINT_TILE_MAX_HEIGHT, support_height) +#define gPaintStructs RCT2_ADDRESS(0x00EE788C, paint_entry) +#define g_currently_drawn_item RCT2_GLOBAL(0x009DE578, void*) +#define gEndOfPaintStructArray RCT2_GLOBAL(0x00EE7880, paint_entry *) +#define gPaintSpritePosition RCT2_GLOBAL(0x009DE568, rct_xy16) +#define gPaintInteractionType RCT2_GLOBAL(RCT2_ADDRESS_PAINT_SETUP_CURRENT_TYPE, uint8) +#define gSupportSegments RCT2_ADDRESS(RCT2_ADDRESS_CURRENT_SUPPORT_SEGMENTS, support_height) +#define gSupport RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_PAINT_TILE_MAX_HEIGHT, support_height) +#define gWoodenSupportsPrependTo RCT2_GLOBAL(0x009DEA58, paint_struct *) #endif /** rct2: 0x00993CC4 */ diff --git a/src/openrct2/paint/supports.c b/src/openrct2/paint/supports.c index 409a46712b..31fefd477c 100644 --- a/src/openrct2/paint/supports.c +++ b/src/openrct2/paint/supports.c @@ -331,10 +331,6 @@ const uint16 word_97B3C4[] = { extern bool gUseOriginalRidePaint; -#ifdef NO_RCT2 -paint_struct * gWoodenSupportsPrependTo; -#endif - /** * Adds paint structs for wooden supports. * rct2: 0x006629BC @@ -463,14 +459,14 @@ bool wooden_a_supports_paint_setup(sint32 supportType, sint32 special, sint32 he unk_supports_desc_bound_box bBox = byte_97B23C[special].bounding_box; - if (byte_97B23C[special].var_6 == 0 || gWoodenSupportsPrependTo == NULL) { + if (byte_97B23C[special].var_6 == 0 || gPaintSession.WoodenSupportsPrependTo == NULL) { sub_98197C(imageId, 0, 0, bBox.length.x, bBox.length.y, bBox.length.z, z, bBox.offset.x, bBox.offset.y, bBox.offset.z + z, rotation); hasSupports = true; } else { hasSupports = true; paint_struct* ps = sub_98198C(imageId, 0, 0, bBox.length.x, bBox.length.y, bBox.length.z, z, bBox.offset.x, bBox.offset.y, bBox.offset.z + z, rotation); if (ps != NULL) { - paint_struct* edi = gWoodenSupportsPrependTo; + paint_struct* edi = gPaintSession.WoodenSupportsPrependTo; edi->var_20 = ps; } } @@ -647,7 +643,7 @@ bool wooden_b_supports_paint_setup(sint32 supportType, sint32 special, sint32 he unk_supports_desc_bound_box boundBox = supportsDesc.bounding_box; - if (supportsDesc.var_6 == 0 || gWoodenSupportsPrependTo == NULL) { + if (supportsDesc.var_6 == 0 || gPaintSession.WoodenSupportsPrependTo == NULL) { sub_98197C( imageId | imageColourFlags, 0, 0, @@ -668,7 +664,7 @@ bool wooden_b_supports_paint_setup(sint32 supportType, sint32 special, sint32 he ); _9E32B1 = true; if (paintStruct != NULL) { - gWoodenSupportsPrependTo->var_20 = paintStruct; + gPaintSession.WoodenSupportsPrependTo->var_20 = paintStruct; } } } @@ -1203,7 +1199,7 @@ bool path_a_supports_paint_setup(sint32 supportType, sint32 special, sint32 heig unk_supports_desc supportsDesc = byte_98D8D4[specialIndex]; unk_supports_desc_bound_box boundBox = supportsDesc.bounding_box; - if (supportsDesc.var_6 == 0 || gWoodenSupportsPrependTo == NULL) { + if (supportsDesc.var_6 == 0 || gPaintSession.WoodenSupportsPrependTo == NULL) { sub_98197C( imageId | imageColourFlags, 0, 0, @@ -1224,7 +1220,7 @@ bool path_a_supports_paint_setup(sint32 supportType, sint32 special, sint32 heig ); hasSupports = true; if (paintStruct != NULL) { - gWoodenSupportsPrependTo->var_20 = paintStruct; + gPaintSession.WoodenSupportsPrependTo->var_20 = paintStruct; } } } diff --git a/src/openrct2/paint/supports.h b/src/openrct2/paint/supports.h index 9da05bba9f..30d4bb6e73 100644 --- a/src/openrct2/paint/supports.h +++ b/src/openrct2/paint/supports.h @@ -20,12 +20,6 @@ #include "../common.h" #include "../world/footpath.h" -#ifdef NO_RCT2 -extern paint_struct * gWoodenSupportsPrependTo; -#else -#define gWoodenSupportsPrependTo RCT2_GLOBAL(0x009DEA58, paint_struct *) -#endif - bool wooden_a_supports_paint_setup(sint32 supportType, sint32 special, sint32 height, uint32 imageColourFlags, bool* underground); bool wooden_b_supports_paint_setup(sint32 supportType, sint32 special, sint32 height, uint32 imageColourFlags, bool* underground); bool metal_a_supports_paint_setup(uint8 supportType, uint8 segment, sint32 special, sint32 height, uint32 imageColourFlags); diff --git a/src/openrct2/ride/coaster/heartline_twister_coaster.c b/src/openrct2/ride/coaster/heartline_twister_coaster.c index 0aa8ecd9de..0ff60fc69d 100644 --- a/src/openrct2/ride/coaster/heartline_twister_coaster.c +++ b/src/openrct2/ride/coaster/heartline_twister_coaster.c @@ -161,12 +161,12 @@ static void heartline_twister_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSeq wooden_a_supports_paint_setup(6, 21, height, gTrackColours[SCHEME_SUPPORTS], NULL); break; case 1: - gWoodenSupportsPrependTo = sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21403, 0, 0, 32, 20, 2, height, 0, 6, height); + gPaintSession.WoodenSupportsPrependTo = sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21403, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21407, 0, 0, 32, 1, 98, height, 0, 27, height); wooden_a_supports_paint_setup(7, 22, height, gTrackColours[SCHEME_SUPPORTS], NULL); break; case 2: - gWoodenSupportsPrependTo = sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21404, 0, 0, 32, 20, 2, height, 0, 6, height); + gPaintSession.WoodenSupportsPrependTo = sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21404, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21408, 0, 0, 32, 1, 98, height, 0, 27, height); wooden_a_supports_paint_setup(6, 23, height, gTrackColours[SCHEME_SUPPORTS], NULL); break; @@ -184,12 +184,12 @@ static void heartline_twister_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSeq wooden_a_supports_paint_setup(6, 21, height, gTrackColours[SCHEME_SUPPORTS], NULL); break; case 1: - gWoodenSupportsPrependTo = sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21347, 0, 0, 32, 20, 2, height, 0, 6, height); + gPaintSession.WoodenSupportsPrependTo = sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21347, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21351, 0, 0, 32, 1, 98, height, 0, 27, height); wooden_a_supports_paint_setup(7, 22, height, gTrackColours[SCHEME_SUPPORTS], NULL); break; case 2: - gWoodenSupportsPrependTo = sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21348, 0, 0, 32, 20, 2, height, 0, 6, height); + gPaintSession.WoodenSupportsPrependTo = sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21348, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21352, 0, 0, 32, 1, 98, height, 0, 27, height); wooden_a_supports_paint_setup(6, 23, height, gTrackColours[SCHEME_SUPPORTS], NULL); break; @@ -279,12 +279,12 @@ static void heartline_twister_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, u wooden_a_supports_paint_setup(6, 13, height, gTrackColours[SCHEME_SUPPORTS], NULL); break; case 1: - gWoodenSupportsPrependTo = sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21387, 0, 0, 32, 20, 2, height, 0, 6, height); + gPaintSession.WoodenSupportsPrependTo = sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21387, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21391, 0, 0, 32, 1, 66, height, 0, 27, height); wooden_a_supports_paint_setup(7, 14, height, gTrackColours[SCHEME_SUPPORTS], NULL); break; case 2: - gWoodenSupportsPrependTo = sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21388, 0, 0, 32, 20, 2, height, 0, 6, height); + gPaintSession.WoodenSupportsPrependTo = sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21388, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21392, 0, 0, 32, 1, 66, height, 0, 27, height); wooden_a_supports_paint_setup(6, 15, height, gTrackColours[SCHEME_SUPPORTS], NULL); break; @@ -302,12 +302,12 @@ static void heartline_twister_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, u wooden_a_supports_paint_setup(6, 13, height, gTrackColours[SCHEME_SUPPORTS], NULL); break; case 1: - gWoodenSupportsPrependTo = sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21331, 0, 0, 32, 20, 2, height, 0, 6, height); + gPaintSession.WoodenSupportsPrependTo = sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21331, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21335, 0, 0, 32, 1, 66, height, 0, 27, height); wooden_a_supports_paint_setup(7, 14, height, gTrackColours[SCHEME_SUPPORTS], NULL); break; case 2: - gWoodenSupportsPrependTo = sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21332, 0, 0, 32, 20, 2, height, 0, 6, height); + gPaintSession.WoodenSupportsPrependTo = sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21332, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21336, 0, 0, 32, 1, 66, height, 0, 27, height); wooden_a_supports_paint_setup(6, 15, height, gTrackColours[SCHEME_SUPPORTS], NULL); break; @@ -338,12 +338,12 @@ static void heartline_twister_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, u wooden_a_supports_paint_setup(6, 17, height, gTrackColours[SCHEME_SUPPORTS], NULL); break; case 1: - gWoodenSupportsPrependTo = sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21395, 0, 0, 32, 20, 2, height, 0, 6, height); + gPaintSession.WoodenSupportsPrependTo = sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21395, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21399, 0, 0, 32, 1, 66, height, 0, 27, height); wooden_a_supports_paint_setup(7, 18, height, gTrackColours[SCHEME_SUPPORTS], NULL); break; case 2: - gWoodenSupportsPrependTo = sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21396, 0, 0, 32, 20, 2, height, 0, 6, height); + gPaintSession.WoodenSupportsPrependTo = sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21396, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21400, 0, 0, 32, 1, 66, height, 0, 27, height); wooden_a_supports_paint_setup(6, 19, height, gTrackColours[SCHEME_SUPPORTS], NULL); break; @@ -361,12 +361,12 @@ static void heartline_twister_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, u wooden_a_supports_paint_setup(6, 17, height, gTrackColours[SCHEME_SUPPORTS], NULL); break; case 1: - gWoodenSupportsPrependTo = sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21339, 0, 0, 32, 20, 2, height, 0, 6, height); + gPaintSession.WoodenSupportsPrependTo = sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21339, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21343, 0, 0, 32, 1, 66, height, 0, 27, height); wooden_a_supports_paint_setup(7, 18, height, gTrackColours[SCHEME_SUPPORTS], NULL); break; case 2: - gWoodenSupportsPrependTo = sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21340, 0, 0, 32, 20, 2, height, 0, 6, height); + gPaintSession.WoodenSupportsPrependTo = sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21340, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 21344, 0, 0, 32, 1, 66, height, 0, 27, height); wooden_a_supports_paint_setup(6, 19, height, gTrackColours[SCHEME_SUPPORTS], NULL); break; diff --git a/src/openrct2/ride/coaster/mine_train_coaster.c b/src/openrct2/ride/coaster/mine_train_coaster.c index 99db3e1fe9..e289dffa33 100644 --- a/src/openrct2/ride/coaster/mine_train_coaster.c +++ b/src/openrct2/ride/coaster/mine_train_coaster.c @@ -150,11 +150,11 @@ static void mine_train_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, wooden_a_supports_paint_setup(6, 21, height, gTrackColours[SCHEME_SUPPORTS], NULL); break; case 1: - gWoodenSupportsPrependTo = sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 20091, 0, 0, 1, 32, 98, height, 27, 0, height); + gPaintSession.WoodenSupportsPrependTo = sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 20091, 0, 0, 1, 32, 98, height, 27, 0, height); wooden_a_supports_paint_setup(7, 22, height, gTrackColours[SCHEME_SUPPORTS], NULL); break; case 2: - gWoodenSupportsPrependTo = sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 20092, 0, 0, 1, 32, 98, height, 27, 0, height); + gPaintSession.WoodenSupportsPrependTo = sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 20092, 0, 0, 1, 32, 98, height, 27, 0, height); wooden_a_supports_paint_setup(6, 23, height, gTrackColours[SCHEME_SUPPORTS], NULL); break; case 3: @@ -231,12 +231,12 @@ static void mine_train_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 tr wooden_a_supports_paint_setup(6, 13, height, gTrackColours[SCHEME_SUPPORTS], NULL); break; case 1: - gWoodenSupportsPrependTo = sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 20079, 0, 0, 32, 20, 1, height, 0, 6, height); + gPaintSession.WoodenSupportsPrependTo = sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 20079, 0, 0, 32, 20, 1, height, 0, 6, height); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 20082, 0, 0, 32, 1, 66, height, 0, 27, height); wooden_a_supports_paint_setup(7, 14, height, gTrackColours[SCHEME_SUPPORTS], NULL); break; case 2: - gWoodenSupportsPrependTo = sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 20080, 0, 0, 32, 20, 1, height, 0, 6, height); + gPaintSession.WoodenSupportsPrependTo = sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 20080, 0, 0, 32, 20, 1, height, 0, 6, height); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 20083, 0, 0, 32, 1, 66, height, 0, 27, height); wooden_a_supports_paint_setup(6, 15, height, gTrackColours[SCHEME_SUPPORTS], NULL); break; @@ -263,12 +263,12 @@ static void mine_train_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 tr wooden_a_supports_paint_setup(6, 17, height, gTrackColours[SCHEME_SUPPORTS], NULL); break; case 1: - gWoodenSupportsPrependTo = sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 20085, 0, 0, 24, 1, 61, height, 4, 29, height - 16); + gPaintSession.WoodenSupportsPrependTo = sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 20085, 0, 0, 24, 1, 61, height, 4, 29, height - 16); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 20088, 0, 0, 32, 2, 66, height, 0, 4, height); wooden_a_supports_paint_setup(7, 18, height, gTrackColours[SCHEME_SUPPORTS], NULL); break; case 2: - gWoodenSupportsPrependTo = sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 20086, 0, 0, 24, 1, 61, height, 4, 29, height - 16); + gPaintSession.WoodenSupportsPrependTo = sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 20086, 0, 0, 24, 1, 61, height, 4, 29, height - 16); sub_98197C_rotated(direction, gTrackColours[SCHEME_TRACK] | 20089, 0, 0, 32, 2, 66, height, 0, 4, height); wooden_a_supports_paint_setup(6, 19, height, gTrackColours[SCHEME_SUPPORTS], NULL); break; diff --git a/src/openrct2/ride/coaster/virginia_reel.c b/src/openrct2/ride/coaster/virginia_reel.c index a22ec06076..d3d0707095 100644 --- a/src/openrct2/ride/coaster/virginia_reel.c +++ b/src/openrct2/ride/coaster/virginia_reel.c @@ -270,7 +270,7 @@ static void paint_virginia_reel_track_25_deg_up(uint8 rideIndex, uint8 trackSequ } if (direction == 1 || direction == 2) { - gWoodenSupportsPrependTo = ps; + gPaintSession.WoodenSupportsPrependTo = ps; } switch (direction) { @@ -315,14 +315,14 @@ static void paint_virginia_reel_track_flat_to_25_deg_up(uint8 rideIndex, uint8 t break; case 1: ps = sub_98197C(imageId, 0, 0, 27, 32, 2, height, 2, 0, height, get_current_rotation()); - gWoodenSupportsPrependTo = ps; + gPaintSession.WoodenSupportsPrependTo = ps; wooden_a_supports_paint_setup(1, 2, height, gTrackColours[SCHEME_SUPPORTS], NULL); paint_util_push_tunnel_right(height, TUNNEL_8); break; case 2: ps = sub_98197C(imageId, 0, 0, 32, 27, 2, height, 0, 2, height, get_current_rotation()); - gWoodenSupportsPrependTo = ps; + gPaintSession.WoodenSupportsPrependTo = ps; wooden_a_supports_paint_setup(0, 3, height, gTrackColours[SCHEME_SUPPORTS], NULL); paint_util_push_tunnel_left(height, TUNNEL_8); @@ -357,7 +357,7 @@ static void paint_virginia_reel_track_25_deg_up_to_flat(uint8 rideIndex, uint8 t } if (direction == 1 || direction == 2) { - gWoodenSupportsPrependTo = ps; + gPaintSession.WoodenSupportsPrependTo = ps; } switch (direction) { diff --git a/src/openrct2/ride/coaster/wooden_roller_coaster.c b/src/openrct2/ride/coaster/wooden_roller_coaster.c index a9c81dc64d..314333d63e 100644 --- a/src/openrct2/ride/coaster/wooden_roller_coaster.c +++ b/src/openrct2/ride/coaster/wooden_roller_coaster.c @@ -530,7 +530,7 @@ static void wooden_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint if (direction == 0 || direction == 3) { wooden_rc_track_paint(imageIds[direction][0], imageIds[direction][1], direction, 0, 0, 32, 25, 2, height, 0, 3, height); } else { - gWoodenSupportsPrependTo = wooden_rc_track_paint(imageIds[direction][0], imageIds[direction][1], direction, 0, 0, 2, 24, 93, height, 28, 4, height - 16); + gPaintSession.WoodenSupportsPrependTo = wooden_rc_track_paint(imageIds[direction][0], imageIds[direction][1], direction, 0, 0, 2, 24, 93, height, 28, 4, height - 16); } wooden_a_supports_paint_setup(direction & 1, 21 + direction, height, gTrackColours[SCHEME_SUPPORTS], NULL); @@ -592,7 +592,7 @@ static void wooden_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackS if (direction == 0 || direction == 3) { wooden_rc_track_paint(imageIds[direction][0], imageIds[direction][1], direction, 0, 0, 32, 25, 2, height, 0, 3, height); } else { - gWoodenSupportsPrependTo = wooden_rc_track_paint(imageIds[direction][0], imageIds[direction][1], direction, 0, 0, 2, 24, 43, height, 28, 4, height + 2); + gPaintSession.WoodenSupportsPrependTo = wooden_rc_track_paint(imageIds[direction][0], imageIds[direction][1], direction, 0, 0, 2, 24, 43, height, 28, 4, height + 2); wooden_rc_track_paint(imageIds[direction][2], imageIds[direction][3], direction, 0, 0, 32, 2, 43, height, 0, 4, height); } wooden_a_supports_paint_setup(direction & 1, 13 + direction, height, gTrackColours[SCHEME_SUPPORTS], NULL); @@ -620,7 +620,7 @@ static void wooden_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackS if (direction == 0 || direction == 3) { wooden_rc_track_paint(imageIds[direction][0], imageIds[direction][1], direction, 0, 0, 32, 25, 2, height, 0, 3, height); } else { - gWoodenSupportsPrependTo = wooden_rc_track_paint(imageIds[direction][0], imageIds[direction][1], direction, 0, 0, 24, 1, 61, height, 4, 28, height - 16); + gPaintSession.WoodenSupportsPrependTo = wooden_rc_track_paint(imageIds[direction][0], imageIds[direction][1], direction, 0, 0, 24, 1, 61, height, 4, 28, height - 16); wooden_rc_track_paint(imageIds[direction][2], imageIds[direction][3], direction, 0, 0, 32, 2, 43, height, 0, 4, height); } wooden_a_supports_paint_setup(direction & 1, 17 + direction, height, gTrackColours[SCHEME_SUPPORTS], NULL); diff --git a/src/openrct2/ride/coaster/wooden_wild_mouse.c b/src/openrct2/ride/coaster/wooden_wild_mouse.c index e2dceeb6a7..9487a6e39e 100644 --- a/src/openrct2/ride/coaster/wooden_wild_mouse.c +++ b/src/openrct2/ride/coaster/wooden_wild_mouse.c @@ -221,7 +221,7 @@ static void wooden_wild_mouse_track_60_deg_up(uint8 rideIndex, uint8 trackSequen if (direction == 0 || direction == 3) { sub_98197C_rotated(direction, imageId, 0, 2, 32, 25, 1, height, 0, 3, height); } else { - gWoodenSupportsPrependTo = sub_98197C_rotated(direction, imageId, 0, 6, 2, 24, 93, height, 28, 4, height - 16); + gPaintSession.WoodenSupportsPrependTo = sub_98197C_rotated(direction, imageId, 0, 6, 2, 24, 93, height, 28, 4, height - 16); } wooden_a_supports_paint_setup(direction & 1, 21 + direction, height, gTrackColours[SCHEME_SUPPORTS], NULL); @@ -295,7 +295,7 @@ static void wooden_wild_mouse_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint sub_98197C_rotated(direction, imageId, 0, 2, 32, 25, 1, height, 0, 3, height); } else { imageId = imageIds[isChained][direction][0] | gTrackColours[SCHEME_TRACK]; - gWoodenSupportsPrependTo = sub_98197C_rotated(direction, imageId, 0, 6, 2, 24, 43, height, 28, 4, height + 2); + gPaintSession.WoodenSupportsPrependTo = sub_98197C_rotated(direction, imageId, 0, 6, 2, 24, 43, height, 28, 4, height + 2); imageId = imageIds[isChained][direction][1] | gTrackColours[SCHEME_TRACK]; sub_98197C_rotated(direction, imageId, 0, 6, 32, 2, 43, height, 0, 4, height); } @@ -336,7 +336,7 @@ static void wooden_wild_mouse_track_60_deg_to_25_deg_up(uint8 rideIndex, uint8 t sub_98197C_rotated(direction, imageId, 0, 2, 32, 25, 1, height, 0, 3, height); } else { imageId = imageIds[isChained][direction][0] | gTrackColours[SCHEME_TRACK]; - gWoodenSupportsPrependTo = sub_98197C_rotated(direction, imageId, 0, 6, 2, 24, 43, height, 28, 4, height + 2); + gPaintSession.WoodenSupportsPrependTo = sub_98197C_rotated(direction, imageId, 0, 6, 2, 24, 43, height, 28, 4, height + 2); imageId = imageIds[isChained][direction][1] | gTrackColours[SCHEME_TRACK]; sub_98197C_rotated(direction, imageId, 0, 6, 32, 2, 43, height, 0, 4, height); } diff --git a/src/openrct2/ride/thrill/go_karts.c b/src/openrct2/ride/thrill/go_karts.c index 3571e67722..b0468c85e2 100644 --- a/src/openrct2/ride/thrill/go_karts.c +++ b/src/openrct2/ride/thrill/go_karts.c @@ -178,7 +178,7 @@ static void paint_go_karts_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, sub_98197C(imageId, 0, 0, 1, 32, 11, height, 29, 0, height + 2, get_current_rotation()); } - gWoodenSupportsPrependTo = ps; + gPaintSession.WoodenSupportsPrependTo = ps; switch (direction) { case 0: @@ -223,7 +223,7 @@ static void paint_go_karts_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackS sub_98197C(imageId, 0, 0, 1, 32, 11, height, 29, 0, height + 2, get_current_rotation()); } - gWoodenSupportsPrependTo = ps; + gPaintSession.WoodenSupportsPrependTo = ps; switch (direction) { case 0: @@ -268,7 +268,7 @@ static void paint_go_karts_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackS sub_98197C(imageId, 0, 0, 1, 32, 11, height, 29, 0, height + 2, get_current_rotation()); } - gWoodenSupportsPrependTo = ps; + gPaintSession.WoodenSupportsPrependTo = ps; switch (direction) { case 0: diff --git a/src/openrct2/ride/water/river_rapids.c b/src/openrct2/ride/water/river_rapids.c index 63a0441116..5f7765a923 100644 --- a/src/openrct2/ride/water/river_rapids.c +++ b/src/openrct2/ride/water/river_rapids.c @@ -313,7 +313,7 @@ static void paint_river_rapids_track_25_deg(uint8 direction, sint32 height, cons case 1: imageId = sprites[direction][0] | gTrackColours[SCHEME_TRACK]; ps = sub_98197C(imageId, 0, 0, 24, 32, 4, height, 4, 0, height, get_current_rotation()); - gWoodenSupportsPrependTo = ps; + gPaintSession.WoodenSupportsPrependTo = ps; imageId = sprites[direction][1] | gTrackColours[SCHEME_TRACK]; sub_98197C(imageId, 0, 0, 1, 32, 34, height, 27, 0, height + 16, get_current_rotation()); @@ -325,7 +325,7 @@ static void paint_river_rapids_track_25_deg(uint8 direction, sint32 height, cons case 2: imageId = sprites[direction][0] | gTrackColours[SCHEME_TRACK]; ps = sub_98197C(imageId, 0, 0, 32, 24, 4, height, 0, 4, height, get_current_rotation()); - gWoodenSupportsPrependTo = ps; + gPaintSession.WoodenSupportsPrependTo = ps; imageId = sprites[direction][1] | gTrackColours[SCHEME_TRACK]; sub_98197C(imageId, 0, 0, 32, 1, 34, height, 0, 27, height + 16, get_current_rotation()); @@ -370,7 +370,7 @@ static void paint_river_rapids_track_25_deg_to_flat_a(uint8 direction, sint32 he case 1: imageId = sprites[direction][0] | gTrackColours[SCHEME_TRACK]; ps = sub_98197C(imageId, 0, 0, 24, 32, 4, height, 4, 0, height, get_current_rotation()); - gWoodenSupportsPrependTo = ps; + gPaintSession.WoodenSupportsPrependTo = ps; imageId = sprites[direction][1] | gTrackColours[SCHEME_TRACK]; sub_98197C(imageId, 0, 0, 1, 32, 18, height, 27, 0, height + 16, get_current_rotation()); @@ -382,7 +382,7 @@ static void paint_river_rapids_track_25_deg_to_flat_a(uint8 direction, sint32 he case 2: imageId = sprites[direction][0] | gTrackColours[SCHEME_TRACK]; ps = sub_98197C(imageId, 0, 0, 32, 24, 4, height, 0, 4, height, get_current_rotation()); - gWoodenSupportsPrependTo = ps; + gPaintSession.WoodenSupportsPrependTo = ps; imageId = sprites[direction][1] | gTrackColours[SCHEME_TRACK]; sub_98197C(imageId, 0, 0, 32, 1, 18, height, 0, 27, height + 16, get_current_rotation()); @@ -427,7 +427,7 @@ static void paint_river_rapids_track_25_deg_to_flat_b(uint8 direction, sint32 he case 1: imageId = sprites[direction][0] | gTrackColours[SCHEME_TRACK]; ps = sub_98197C(imageId, 0, 0, 24, 32, 11, height, 4, 0, height, get_current_rotation()); - gWoodenSupportsPrependTo = ps; + gPaintSession.WoodenSupportsPrependTo = ps; imageId = sprites[direction][1] | gTrackColours[SCHEME_TRACK]; sub_98197C(imageId, 0, 0, 1, 32, 26, height, 27, 0, height + 16, get_current_rotation()); @@ -439,7 +439,7 @@ static void paint_river_rapids_track_25_deg_to_flat_b(uint8 direction, sint32 he case 2: imageId = sprites[direction][0] | gTrackColours[SCHEME_TRACK]; ps = sub_98197C(imageId, 0, 0, 32, 24, 11, height, 0, 4, height, get_current_rotation()); - gWoodenSupportsPrependTo = ps; + gPaintSession.WoodenSupportsPrependTo = ps; imageId = sprites[direction][1] | gTrackColours[SCHEME_TRACK]; sub_98197C(imageId, 0, 0, 32, 1, 26, height, 0, 27, height + 16, get_current_rotation()); diff --git a/src/openrct2/ride/water/splash_boats.c b/src/openrct2/ride/water/splash_boats.c index 110cba3e10..e31db1e603 100644 --- a/src/openrct2/ride/water/splash_boats.c +++ b/src/openrct2/ride/water/splash_boats.c @@ -522,7 +522,7 @@ static void paint_splash_boats_track_60_deg_up(uint8 rideIndex, uint8 trackSeque uint32 imageId = SplashBoats60DegUpImageId[direction] | gTrackColours[SCHEME_TRACK]; uint32 frontImageId = SplashBoats60DegUpFrontImageId[direction] | gTrackColours[SCHEME_TRACK]; - gWoodenSupportsPrependTo = sub_98197C_rotated(direction, imageId, 0, 0, 32, 20, 2, height, 0, 6, height); + gPaintSession.WoodenSupportsPrependTo = sub_98197C_rotated(direction, imageId, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 1, 98, height, 0, 27, height); wooden_a_supports_paint_setup((direction & 1), 21 + direction, height, gTrackColours[SCHEME_SUPPORTS], NULL); @@ -579,7 +579,7 @@ static void paint_splash_boats_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uin uint32 imageId = SplashBoats25DegUpTo60DegUpImageId[direction] | gTrackColours[SCHEME_TRACK]; uint32 frontImageId = SplashBoats25DegUpTo60DegUpFrontImageId[direction] | gTrackColours[SCHEME_TRACK]; - gWoodenSupportsPrependTo = sub_98197C_rotated(direction, imageId, 0, 0, 32, 20, 2, height, 0, 6, height); + gPaintSession.WoodenSupportsPrependTo = sub_98197C_rotated(direction, imageId, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 1, 66, height, 0, 27, height); wooden_a_supports_paint_setup((direction & 1), 13 + direction, height, gTrackColours[SCHEME_SUPPORTS], NULL); @@ -598,7 +598,7 @@ static void paint_splash_boats_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uin uint32 imageId = SplashBoats60DegUpTo25DegUpImageId[direction] | gTrackColours[SCHEME_TRACK]; uint32 frontImageId = SplashBoats60DegUpTo25DegUpFrontImageId[direction] | gTrackColours[SCHEME_TRACK]; - gWoodenSupportsPrependTo = sub_98197C_rotated(direction, imageId, 0, 0, 32, 20, 2, height, 0, 6, height); + gPaintSession.WoodenSupportsPrependTo = sub_98197C_rotated(direction, imageId, 0, 0, 32, 20, 2, height, 0, 6, height); sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 1, 66, height, 0, 27, height); wooden_a_supports_paint_setup((direction & 1), 17 + direction, height, gTrackColours[SCHEME_SUPPORTS], NULL);