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

Replace 0x009DE56A, 0x009DE56E with gPaintMapPosition

This commit is contained in:
Ted John 2016-09-14 22:07:42 +01:00 committed by GitHub
parent f28c35712f
commit 931fc59506
33 changed files with 79 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/paint/map_element/map_element.c
View File

@ -153,8 +153,10 @@ static void sub_68B3FB(int x, int y)
gVerticalTunnelHeight = 0xFF;
RCT2_GLOBAL(0x9DE56A, uint16_t) = x;
RCT2_GLOBAL(0x9DE56E, uint16_t) = y;
#ifndef NO_RCT2
RCT2_GLOBAL(0x009DE56A, uint16) = x;
RCT2_GLOBAL(0x009DE56E, uint16) = y;
#endif
gPaintMapPosition.x = x;
gPaintMapPosition.y = y;
@ -183,8 +185,8 @@ static void sub_68B3FB(int x, int y)
dx >>= 1;
// Display little yellow arrow when building footpaths?
if ((gMapSelectFlags & MAP_SELECT_FLAG_ENABLE_ARROW) &&
RCT2_GLOBAL(0x9DE56A, uint16) == gMapSelectArrowPosition.x &&
RCT2_GLOBAL(0x9DE56E, uint16) == gMapSelectArrowPosition.y
gPaintMapPosition.x == gMapSelectArrowPosition.x &&
gPaintMapPosition.y == gMapSelectArrowPosition.y
) {
uint8 arrowRotation =
(rotation

4
src/paint/map_element/path.c
View File

@ -701,7 +701,7 @@ void path_paint(uint8 direction, uint16 height, rct_map_element * map_element)
imageFlags = construction_markers[gConfigGeneral.construction_marker_colour];
}
sint16 x = RCT2_GLOBAL(0x009DE56A, sint16), y = RCT2_GLOBAL(0x009DE56E, sint16);
sint16 x = gPaintMapPosition.x, y = gPaintMapPosition.y;
rct_map_element * surface = map_get_surface_element_at(x / 32, y / 32);
@ -728,7 +728,7 @@ void path_paint(uint8 direction, uint16 height, rct_map_element * map_element)
sint32 staffIndex = gStaffDrawPatrolAreas;
uint8 staffType = staffIndex & 0x7FFF;
bool is_staff_list = staffIndex & 0x8000;
sint16 x = RCT2_GLOBAL(0x009DE56A, sint16), y = RCT2_GLOBAL(0x009DE56E, sint16);
sint16 x = gPaintMapPosition.x, y = gPaintMapPosition.y;
uint8 patrolColour = COLOUR_LIGHT_BLUE;

18
src/paint/map_element/surface.c
View File

@ -1023,7 +1023,7 @@ void surface_paint(uint8 direction, uint16 height, rct_map_element * mapElement)
if ((gCurrentViewportFlags & VIEWPORT_FLAG_LAND_HEIGHTS) && (zoomLevel == 0)) {
sint16 x = RCT2_GLOBAL(0x009DE56A, sint16), y = RCT2_GLOBAL(0x009DE56E, sint16);
sint16 x = gPaintMapPosition.x, y = gPaintMapPosition.y;
int dx = map_element_height(x + 16, y + 16) & 0xFFFF;
dx += 3;
@ -1096,8 +1096,8 @@ void surface_paint(uint8 direction, uint16 height, rct_map_element * mapElement)
case 6:
// loc_660C6A
{
sint16 x = RCT2_GLOBAL(0x009DE56A, sint16) & 0x20;
sint16 y = RCT2_GLOBAL(0x009DE56E, sint16) & 0x20;
sint16 x = gPaintMapPosition.x & 0x20;
sint16 y = gPaintMapPosition.y & 0x20;
int index = (y | (x << 1)) >> 5;
if (branch == 6) {
@ -1120,7 +1120,7 @@ void surface_paint(uint8 direction, uint16 height, rct_map_element * mapElement)
sint32 staffIndex = gStaffDrawPatrolAreas;
bool is_staff_list = staffIndex & 0x8000;
uint8 staffType = staffIndex & 0x7FFF;
sint16 x = RCT2_GLOBAL(0x009DE56A, sint16), y = RCT2_GLOBAL(0x009DE56E, sint16);
sint16 x = gPaintMapPosition.x, y = gPaintMapPosition.y;
uint32 image_id = 0x20000000;
uint8 patrolColour = 7;
@ -1146,7 +1146,7 @@ void surface_paint(uint8 direction, uint16 height, rct_map_element * mapElement)
if (((gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) || gCheatsSandboxMode) &&
gCurrentViewportFlags & VIEWPORT_FLAG_LAND_OWNERSHIP
) {
rct_xy16 pos = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y};
for (int i = 0; i < 2; ++i) {
rct2_peep_spawn * spawn = &gPeepSpawns[i];
@ -1168,7 +1168,7 @@ void surface_paint(uint8 direction, uint16 height, rct_map_element * mapElement)
// TODO: SPR_TERRAIN_SELECTION_SQUARE?
paint_attach_to_previous_ps(2625 + byte_97B444[surfaceShape], 0, 0);
} else if (mapElement->properties.surface.ownership & OWNERSHIP_AVAILABLE) {
rct_xy16 pos = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y};
paint_struct * backup = g_ps_F1AD28;
int height = (map_element_height(pos.x + 16, pos.y + 16) & 0xFFFF) + 3;
sub_98196C(22955, 16, 16, 1, 1, 0, height, rotation);
@ -1184,7 +1184,7 @@ void surface_paint(uint8 direction, uint16 height, rct_map_element * mapElement)
paint_attach_to_previous_ps(2644 + byte_97B444[surfaceShape], 0, 0);
} else if (mapElement->properties.surface.ownership & OWNERSHIP_CONSTRUCTION_RIGHTS_AVAILABLE) {
paint_struct * backup = g_ps_F1AD28;
rct_xy16 pos = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y};
int height = map_element_height(pos.x + 16, pos.y + 16) & 0xFFFF;
sub_98196C(22956, 16, 16, 1, 1, 0, height + 3, rotation);
g_ps_F1AD28 = backup;
@ -1197,7 +1197,7 @@ void surface_paint(uint8 direction, uint16 height, rct_map_element * mapElement)
if (gMapSelectFlags & MAP_SELECT_FLAG_ENABLE) {
// loc_660FB8:
rct_xy16 pos = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y};
if (pos.x >= gMapSelectPositionA.x &&
pos.x <= gMapSelectPositionB.x &&
pos.y >= gMapSelectPositionA.y &&
@ -1259,7 +1259,7 @@ void surface_paint(uint8 direction, uint16 height, rct_map_element * mapElement)
}
if (gMapSelectFlags & MAP_SELECT_FLAG_ENABLE_CONSTRUCT) {
rct_xy16 pos = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y};
rct_xy16 * tile;
for (tile = gMapSelectionTiles; tile->x != -1; tile++) {

36
src/ride/coaster/junior_roller_coaster.c
View File

@ -1696,7 +1696,7 @@ static const uint32 junior_rc_track_pieces_diag_60_deg_down_to_25_deg_down[2][4]
/* rct2: 0x00518394 */
static void junior_rc_flat_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element* mapElement){
rct_xy16 position = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
uint32 imageId = 0;
bool isChained = mapElement->type & (1 << 7);
@ -1793,7 +1793,7 @@ static void junior_rc_25_deg_up_paint_setup(uint8 rideIndex, uint8 trackSequence
paint_util_push_tunnel_left(height + tunnel_height[direction], tunnel_type[direction]);
}
const rct_xy16 pos = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
const rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y};
if (track_paint_util_should_paint_supports(pos)) {
int edi = direction & 1 ? 2 : 1;
@ -1821,7 +1821,7 @@ static void junior_rc_flat_to_25_deg_up_paint_setup(uint8 rideIndex, uint8 track
paint_util_push_tunnel_left(height, TUNNEL_0);
}
const rct_xy16 pos = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
const rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y};
if (track_paint_util_should_paint_supports(pos)) {
int edi = direction & 1 ? 2 : 1;
@ -1861,7 +1861,7 @@ static void junior_rc_25_deg_up_to_flat_paint_setup(uint8 rideIndex, uint8 track
paint_util_push_tunnel_left(tunnelHeight, tunnelType);
}
const rct_xy16 pos = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
const rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y};
if (track_paint_util_should_paint_supports(pos)) {
int edi = direction & 1 ? 2 : 1;
@ -1976,7 +1976,7 @@ static void junior_rc_flat_to_left_bank_paint_setup(uint8 rideIndex, uint8 track
}
}
const rct_xy16 pos = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
const rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y};
if (track_paint_util_should_paint_supports(pos)) {
int edi = direction & 1 ? 2 : 1;
metal_a_supports_paint_setup(edi, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
@ -2016,7 +2016,7 @@ static void junior_rc_flat_to_right_bank_paint_setup(uint8 rideIndex, uint8 trac
}
}
const rct_xy16 pos = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
const rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y};
if (track_paint_util_should_paint_supports(pos)) {
int edi = direction & 1 ? 2 : 1;
metal_a_supports_paint_setup(edi, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
@ -2188,7 +2188,7 @@ static void junior_rc_left_bank_to_25_deg_up_paint_setup(uint8 rideIndex, uint8
}
}
const rct_xy16 pos = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
const rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y};
if (track_paint_util_should_paint_supports(pos)) {
int edi = direction & 1 ? 2 : 1;
metal_a_supports_paint_setup(edi, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
@ -2228,7 +2228,7 @@ static void junior_rc_right_bank_to_25_deg_up_paint_setup(uint8 rideIndex, uint8
}
}
const rct_xy16 pos = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
const rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y};
if (track_paint_util_should_paint_supports(pos)) {
int edi = direction & 1 ? 2 : 1;
metal_a_supports_paint_setup(edi, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
@ -2279,7 +2279,7 @@ static void junior_rc_25_deg_up_to_left_bank_paint_setup(uint8 rideIndex, uint8
}
}
const rct_xy16 pos = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
const rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y};
if (track_paint_util_should_paint_supports(pos)) {
int edi = direction & 1 ? 2 : 1;
metal_a_supports_paint_setup(edi, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
@ -2330,7 +2330,7 @@ static void junior_rc_25_deg_up_to_right_bank_paint_setup(uint8 rideIndex, uint8
}
}
const rct_xy16 pos = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
const rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y};
if (track_paint_util_should_paint_supports(pos)) {
int edi = direction & 1 ? 2 : 1;
metal_a_supports_paint_setup(edi, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
@ -2410,7 +2410,7 @@ static void junior_rc_left_bank_paint_setup(uint8 rideIndex, uint8 trackSequence
paint_util_push_tunnel_left(height, 0);
}
const rct_xy16 pos = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
const rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y};
if (track_paint_util_should_paint_supports(pos)) {
int edi = direction & 1 ? 2 : 1;
metal_a_supports_paint_setup(edi, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
@ -3202,7 +3202,7 @@ static void junior_rc_brake_paint_setup(uint8 rideIndex, uint8 trackSequence, ui
paint_util_push_tunnel_left(height, TUNNEL_0);
}
const rct_xy16 pos = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
const rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y};
if (track_paint_util_should_paint_supports(pos)) {
int edi = direction & 1 ? 2 : 1;
metal_a_supports_paint_setup(edi, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
@ -3233,7 +3233,7 @@ static void junior_rc_block_brake_paint_setup(uint8 rideIndex, uint8 trackSequen
paint_util_push_tunnel_left(height, TUNNEL_0);
}
const rct_xy16 pos = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
const rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y};
if (track_paint_util_should_paint_supports(pos)) {
int edi = direction & 1 ? 2 : 1;
metal_a_supports_paint_setup(edi, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
@ -4041,7 +4041,7 @@ static void junior_rc_60_deg_up_paint_setup(uint8 rideIndex, uint8 trackSequence
break;
}
const rct_xy16 pos = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
const rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y};
sint8 support[4] = { 35, 29, 25, 32};
if (track_paint_util_should_paint_supports(pos)) {
@ -4130,7 +4130,7 @@ static void junior_rc_25_deg_up_to_60_deg_up_paint_setup(uint8 rideIndex, uint8
break;
}
const rct_xy16 pos = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
const rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y};
sint8 support[4] = { 12, 12, 12, 14};
if (track_paint_util_should_paint_supports(pos)) {
@ -4198,7 +4198,7 @@ static void junior_rc_60_deg_up_to_25_deg_up_paint_setup(uint8 rideIndex, uint8
break;
}
const rct_xy16 pos = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
const rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y};
if (track_paint_util_should_paint_supports(pos)) {
metal_a_supports_paint_setup(direction & 1 ? 2 : 1, 4, 20, height, gTrackColours[SCHEME_SUPPORTS]);
@ -4384,7 +4384,7 @@ static void junior_rc_flat_to_60_deg_up_paint_setup(uint8 rideIndex, uint8 track
break;
}
const rct_xy16 pos = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
const rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y};
sint8 support[4] = { 12, 12, 12, 14};
if (track_paint_util_should_paint_supports(pos)) {
@ -4453,7 +4453,7 @@ static void junior_rc_60_deg_up_to_flat_paint_setup(uint8 rideIndex, uint8 track
break;
}
const rct_xy16 pos = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
const rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y};
if (track_paint_util_should_paint_supports(pos)) {
metal_a_supports_paint_setup(direction & 1 ? 2 : 1, 4, 20, height - 5, gTrackColours[SCHEME_SUPPORTS]);

6
src/ride/gentle/car_ride.c
View File

@ -421,7 +421,7 @@ static void paint_car_ride_track_spinning_tunnel(uint8 rideIndex, uint8 trackSeq
/** rct2: 0x006F73B8 */
static void paint_car_ride_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement)
{
rct_xy16 position = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
uint32 imageId = car_ride_track_pieces_60_deg_up[direction] | gTrackColours[SCHEME_TRACK];
@ -467,7 +467,7 @@ static void paint_car_ride_track_60_deg_up(uint8 rideIndex, uint8 trackSequence,
/** rct2: 0x006F73C8 */
static void paint_car_ride_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement)
{
rct_xy16 position = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
uint32 imageId = car_ride_track_pieces_25_deg_up_to_60_deg_up[direction][0] | gTrackColours[SCHEME_TRACK];
@ -513,7 +513,7 @@ static void paint_car_ride_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 t
/** rct2: 0x006F73D8 */
static void paint_car_ride_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement)
{
rct_xy16 position = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
uint32 imageId = car_ride_track_pieces_60_deg_up_to_25_deg_up[direction][0] | gTrackColours[SCHEME_TRACK];

2
src/ride/gentle/circus_show.c
View File

@ -57,7 +57,7 @@ static void paint_circus_show(uint8 rideIndex, uint8 trackSequence, uint8 direct
int edges = edges_3x3[trackSequence];
rct_ride * ride = get_ride(rideIndex);
rct_xy16 position = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
wooden_a_supports_paint_setup((direction & 1), 0, height, gTrackColours[SCHEME_MISC], NULL);

2
src/ride/gentle/crooked_house.c
View File

@ -72,7 +72,7 @@ static void paint_crooked_house(uint8 rideIndex, uint8 trackSequence, uint8 dire
int edges = edges_3x3[trackSequence];
rct_ride * ride = get_ride(rideIndex);
rct_xy16 position = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
wooden_a_supports_paint_setup((direction & 1), 0, height, gTrackColours[SCHEME_MISC], NULL);

2
src/ride/gentle/dodgems.c
View File

@ -53,7 +53,7 @@ static void paint_dodgems(uint8 rideIndex, uint8 trackSequence, uint8 direction,
int edges = edges_4x4[relativeTrackSequence];
rct_ride * ride = get_ride(rideIndex);
rct_xy16 position = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
wooden_a_supports_paint_setup(direction & 1, 0, height, gTrackColours[SCHEME_MISC], NULL);

2
src/ride/gentle/ferris_wheel.c
View File

@ -141,7 +141,7 @@ static void paint_ferris_wheel(uint8 rideIndex, uint8 trackSequence, uint8 direc
}
rct_ride * ride = get_ride(rideIndex);
rct_xy16 position = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
wooden_a_supports_paint_setup(direction & 1, 0, height, gTrackColours[SCHEME_MISC], NULL);

2
src/ride/gentle/flying_saucers.c
View File

@ -46,7 +46,7 @@ static void paint_flying_saucers(uint8 rideIndex, uint8 trackSequence, uint8 dir
int edges = edges_4x4[relativeTrackSequence];
rct_ride * ride = get_ride(rideIndex);
rct_xy16 position = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
wooden_a_supports_paint_setup(direction & 1, 0, height, gTrackColours[SCHEME_MISC], NULL);

10
src/ride/gentle/ghost_train.c
View File

@ -150,7 +150,7 @@ static const uint32 ghost_train_track_pieces_brakes[4] = {
/** rct2: 0x00770BEC */
static void paint_ghost_train_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement)
{
rct_xy16 position = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
uint32 imageId = ghost_train_track_pieces_flat[direction] | gTrackColours[SCHEME_TRACK];
@ -177,7 +177,7 @@ static void paint_ghost_train_track_flat(uint8 rideIndex, uint8 trackSequence, u
/** rct2: 0x00770BFC */
static void paint_ghost_train_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement)
{
rct_xy16 position = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
uint32 imageId = ghost_train_track_pieces_25_deg_up[direction][0] | gTrackColours[SCHEME_TRACK];
if (direction == 0 || direction == 2) {
@ -220,7 +220,7 @@ static void paint_ghost_train_track_25_deg_up(uint8 rideIndex, uint8 trackSequen
/** rct2: 0x00770C0C */
static void paint_ghost_train_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement)
{
rct_xy16 position = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
uint32 imageId = ghost_train_track_pieces_flat_to_25_deg_up[direction][0] | gTrackColours[SCHEME_TRACK];
if (direction == 0 || direction == 2) {
@ -262,7 +262,7 @@ static void paint_ghost_train_track_flat_to_25_deg_up(uint8 rideIndex, uint8 tra
/** rct2: 0x00770C1C */
static void paint_ghost_train_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement)
{
rct_xy16 position = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
uint32 imageId = ghost_train_track_pieces_25_deg_up_to_flat[direction][0] | gTrackColours[SCHEME_TRACK];
if (direction == 0 || direction == 2) {
@ -435,7 +435,7 @@ static void paint_ghost_train_track_spinning_tunnel(uint8 rideIndex, uint8 track
/** rct2: 0x00770CDC */
static void paint_ghost_train_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement)
{
rct_xy16 position = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
uint32 imageId = ghost_train_track_pieces_brakes[direction] | gTrackColours[SCHEME_TRACK];

2
src/ride/gentle/haunted_house.c
View File

@ -91,7 +91,7 @@ static void paint_haunted_house(uint8 rideIndex, uint8 trackSequence, uint8 dire
int edges = edges_3x3[trackSequence];
rct_ride * ride = get_ride(rideIndex);
rct_xy16 position = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
wooden_a_supports_paint_setup((direction & 1), 0, height, gTrackColours[SCHEME_MISC], NULL);

2
src/ride/gentle/merry_go_round.c
View File

@ -110,7 +110,7 @@ static void paint_merry_go_round(uint8 rideIndex, uint8 trackSequence, uint8 dir
int edges = edges_3x3[trackSequence];
rct_ride * ride = get_ride(rideIndex);
rct_xy16 position = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
wooden_a_supports_paint_setup((direction & 1), 0, height, gTrackColours[SCHEME_MISC], NULL);

2
src/ride/gentle/mini_golf.c
View File

@ -624,7 +624,7 @@ static void paint_mini_golf_track_25_deg_down_to_flat(uint8 rideIndex, uint8 tra
/** rct2: 0x0087F17C, 0x0087F18C, 0x0087F19C */
static void paint_mini_golf_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement)
{
rct_xy16 position = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
rct_ride * ride = get_ride(rideIndex);
const rct_ride_entrance_definition * entranceStyle = &RideEntranceDefinitions[ride->entrance_style];
uint32 imageId;

8
src/ride/gentle/mini_helicopters.c
View File

@ -60,7 +60,7 @@ static void paint_mini_helicopters_track_station(uint8 rideIndex, uint8 trackSeq
/** rct2: 0x0081F348 */
static void paint_mini_helicopters_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement)
{
rct_xy16 position = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
uint32 imageId;
if (direction & 1) {
@ -84,7 +84,7 @@ static void paint_mini_helicopters_track_flat(uint8 rideIndex, uint8 trackSequen
/** rct2: 0x0081F368 */
static void paint_mini_helicopters_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement)
{
rct_xy16 position = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
uint32 imageId;
switch (direction) {
@ -121,7 +121,7 @@ static void paint_mini_helicopters_track_flat_to_25_deg_up(uint8 rideIndex, uint
/** rct2: 0x0081F358 */
static void paint_mini_helicopters_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement)
{
rct_xy16 position = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
uint32 imageId;
switch (direction) {
@ -158,7 +158,7 @@ static void paint_mini_helicopters_track_25_deg_up(uint8 rideIndex, uint8 trackS
/** rct2: 0x0081F378 */
static void paint_mini_helicopters_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement)
{
rct_xy16 position = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
uint32 imageId;
switch (direction) {

2
src/ride/gentle/observation_tower.c
View File

@ -76,7 +76,7 @@ static void paint_observation_tower_base(uint8 rideIndex, uint8 trackSequence, u
int edges = edges_3x3[trackSequence];
rct_ride * ride = get_ride(rideIndex);
rct_xy16 position = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
wooden_a_supports_paint_setup((direction & 1), 0, height, gTrackColours[SCHEME_MISC], NULL);

2
src/ride/gentle/space_rings.c
View File

@ -91,7 +91,7 @@ static void paint_space_rings(uint8 rideIndex, uint8 trackSequence, uint8 direct
int edges = edges_3x3[trackSequence];
rct_ride * ride = get_ride(rideIndex);
rct_xy16 position = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
uint32 imageId;

2
src/ride/gentle/spiral_slide.c
View File

@ -169,7 +169,7 @@ static void paint_spiral_slide(uint8 rideIndex, uint8 trackSequence, uint8 direc
int edges = edges_2x2[trackSequence];
rct_ride * ride = get_ride(rideIndex);
rct_xy16 position = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
wooden_a_supports_paint_setup(direction & 1, 0, height, gTrackColours[SCHEME_MISC], NULL);

2
src/ride/thrill/3d_cinema.c
View File

@ -59,7 +59,7 @@ static void paint_3d_cinema(uint8 rideIndex, uint8 trackSequence, uint8 directio
int edges = edges_3x3[trackSequence];
rct_ride * ride = get_ride(rideIndex);
rct_xy16 position = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
wooden_a_supports_paint_setup((direction & 1), 0, height, gTrackColours[SCHEME_MISC], NULL);

2
src/ride/thrill/enterprise.c
View File

@ -82,7 +82,7 @@ static void paint_enterprise(uint8 rideIndex, uint8 trackSequence, uint8 directi
int edges = edges_4x4[trackSequence];
rct_ride * ride = get_ride(rideIndex);
rct_xy16 position = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
wooden_a_supports_paint_setup(direction & 1, 0, height, gTrackColours[SCHEME_MISC], NULL);

2
src/ride/thrill/go_karts.c
View File

@ -321,7 +321,7 @@ static void paint_go_karts_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trac
/** rct2: 0x */
static void paint_go_karts_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement)
{
rct_xy16 position = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
rct_ride * ride = get_ride(rideIndex);
const rct_ride_entrance_definition * entranceStyle = &RideEntranceDefinitions[ride->entrance_style];

2
src/ride/thrill/launched_freefall.c
View File

@ -91,7 +91,7 @@ static void paint_launched_freefall_base(uint8 rideIndex, uint8 trackSequence, u
int edges = edges_3x3[trackSequence];
rct_ride * ride = get_ride(rideIndex);
rct_xy16 position = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
wooden_a_supports_paint_setup((direction & 1), 0, height, gTrackColours[SCHEME_MISC], NULL);

2
src/ride/thrill/motion_simulator.c
View File

@ -131,7 +131,7 @@ static void paint_motionsimulator(uint8 rideIndex, uint8 trackSequence, uint8 di
int edges = edges_2x2[trackSequence];
rct_ride *ride = get_ride(rideIndex);
rct_xy16 position = { RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16) };
rct_xy16 position = { gPaintMapPosition.x, gPaintMapPosition.y };
wooden_a_supports_paint_setup((direction & 1), 0, height, gTrackColours[SCHEME_MISC], NULL);
track_paint_util_paint_floor(edges, gTrackColours[SCHEME_TRACK], height, floorSpritesCork, get_current_rotation());

2
src/ride/thrill/pirate_ship.c
View File

@ -163,7 +163,7 @@ static void paint_pirate_ship(uint8 rideIndex, uint8 trackSequence, uint8 direct
{
uint8 relativeTrackSequence = track_map_1x5[direction][trackSequence];
rct_ride * ride = get_ride(rideIndex);
rct_xy16 position = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
uint32 imageId;
bool hasFence;

2
src/ride/thrill/roto_drop.c
View File

@ -91,7 +91,7 @@ static void paint_roto_drop_base(uint8 rideIndex, uint8 trackSequence, uint8 dir
int edges = edges_3x3[trackSequence];
rct_ride * ride = get_ride(rideIndex);
rct_xy16 position = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
wooden_a_supports_paint_setup((direction & 1), 0, height, gTrackColours[SCHEME_MISC], NULL);

2
src/ride/thrill/top_spin.c
View File

@ -262,7 +262,7 @@ static void paint_top_spin(uint8 rideIndex, uint8 trackSequence, uint8 direction
int edges = edges_3x3[trackSequence];
rct_ride *ride = get_ride(rideIndex);
rct_xy16 position = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
wooden_a_supports_paint_setup(direction & 1, 0, height, gTrackColours[SCHEME_MISC], NULL);

2
src/ride/thrill/twist.c
View File

@ -85,7 +85,7 @@ static void paint_twist(uint8 rideIndex, uint8 trackSequence, uint8 direction, i
const uint8 edges = edges_3x3[trackSequence];
rct_ride * ride = get_ride(rideIndex);
rct_xy16 position = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
uint32 imageId;

4
src/ride/track_paint.c
View File

@ -288,7 +288,7 @@ bool track_paint_util_should_paint_supports(rct_xy16 position)
void track_paint_util_draw_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement)
{
rct_xy16 position = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
rct_ride * ride = get_ride(rideIndex);
const rct_ride_entrance_definition * entranceStyle = &RideEntranceDefinitions[ride->entrance_style];
const bool hasGreenLight = (bool) (mapElement->properties.track.sequence & 0x80);
@ -482,7 +482,7 @@ bool track_paint_util_draw_station_covers(enum edge edge, bool hasFence, const r
void track_paint_util_draw_station_platform(rct_ride *ride, uint8 direction, int height, int zOffset, rct_map_element * mapElement)
{
rct_xy16 position = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
const rct_ride_entrance_definition * entranceStyle = &RideEntranceDefinitions[ride->entrance_style];
if (direction & 1) {
bool hasFence = track_paint_util_has_fence(EDGE_NE, position, mapElement, ride, get_current_rotation());

4
src/ride/transport/chairlift.c
View File

@ -166,7 +166,7 @@ static bool chairlift_paint_util_is_last_track(uint8 rideIndex, const rct_map_el
static void chairlift_paint_station_ne_sw(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement)
{
const rct_xy16 pos = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
const rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y};
uint8 trackType = mapElement->properties.track.type;
rct_ride * ride = get_ride(rideIndex);
uint32 imageId;
@ -245,7 +245,7 @@ static void chairlift_paint_station_ne_sw(uint8 rideIndex, uint8 trackSequence,
static void chairlift_paint_station_se_nw(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement)
{
const rct_xy16 pos = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
const rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y};
uint8 trackType = mapElement->properties.track.type;
rct_ride * ride = get_ride(rideIndex);
uint32 imageId;

2
src/ride/transport/lift.c
View File

@ -77,7 +77,7 @@ static void paint_lift_base(uint8 rideIndex, uint8 trackSequence, uint8 directio
int edges = edges_3x3[trackSequence];
rct_ride * ride = get_ride(rideIndex);
rct_xy16 position = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
uint32 imageId = SPR_FLOOR_METAL_B | gTrackColours[SCHEME_SUPPORTS];
sub_98197C(imageId, 0, 0, 32, 32, 1, height, 0, 0, height, get_current_rotation());

8
src/ride/transport/monorail.c
View File

@ -444,7 +444,7 @@ static const uint32 monorail_track_pieces_diag_25_deg_up[4] = {
/** rct2: 0x008AE1AC */
static void paint_monorail_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement)
{
rct_xy16 position = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
uint32 imageId = monorail_track_pieces_flat[direction] | gTrackColours[SCHEME_TRACK];
@ -511,7 +511,7 @@ static void paint_monorail_station(uint8 rideIndex, uint8 trackSequence, uint8 d
/** rct2: 0x008AE1BC */
static void paint_monorail_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement)
{
rct_xy16 position = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
uint32 imageId = monorail_track_pieces_25_deg_up[direction] | gTrackColours[SCHEME_TRACK];
@ -539,7 +539,7 @@ static void paint_monorail_track_25_deg_up(uint8 rideIndex, uint8 trackSequence,
/** rct2: 0x008AE1CC */
static void paint_monorail_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement)
{
rct_xy16 position = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
uint32 imageId = monorail_track_pieces_flat_to_25_deg_up[direction] | gTrackColours[SCHEME_TRACK];
@ -567,7 +567,7 @@ static void paint_monorail_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackS
/** rct2: 0x008AE1DC */
static void paint_monorail_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement)
{
rct_xy16 position = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
uint32 imageId = monorail_track_pieces_25_deg_up_to_flat[direction] | gTrackColours[SCHEME_TRACK];

2
src/ride/water/boat_ride.c
View File

@ -63,7 +63,7 @@ static void paint_boat_ride_track_flat(uint8 rideIndex, uint8 trackSequence, uin
/** rct2: 0x008B0E50 */
static void paint_boat_ride_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement)
{
rct_xy16 position = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
rct_ride * ride = get_ride(rideIndex);
const rct_ride_entrance_definition * entranceStyle = &RideEntranceDefinitions[ride->entrance_style];

4
src/ride/water/submarine_ride.c
View File

@ -69,7 +69,7 @@ void vehicle_visual_submarine(int x, int imageDirection, int y, int z, rct_vehic
static void submarine_ride_paint_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement)
{
rct_xy16 position = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
rct_ride * ride = get_ride(rideIndex);
const rct_ride_entrance_definition * entranceStyle = &RideEntranceDefinitions[ride->entrance_style];
int heightLower = height - 16;
@ -95,7 +95,7 @@ static void submarine_ride_paint_track_station(uint8 rideIndex, uint8 trackSeque
static void submarine_ride_paint_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement)
{
rct_xy16 position = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
int heightLower = height - 16;
uint32 imageId;