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

Simplify gPaintMapPosition to rct_xy16

This commit is contained in:
Ted John 2017-09-01 12:41:59 +01:00
parent d794057f8c
commit 5730a36555
31 changed files with 65 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1173,7 +1173,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 = {gPaintMapPosition.x, gPaintMapPosition.y};
rct_xy16 pos = gPaintMapPosition;
for (sint32 i = 0; i < MAX_PEEP_SPAWNS; ++i) {
rct2_peep_spawn * spawn = &gPeepSpawns[i];
@ -1193,7 +1193,7 @@ void surface_paint(uint8 direction, uint16 height, rct_map_element * mapElement)
assert(surfaceShape < countof(byte_97B444));
paint_attach_to_previous_ps(SPR_TERRAIN_SELECTION_SQUARE + byte_97B444[surfaceShape], 0, 0);
} else if (mapElement->properties.surface.ownership & OWNERSHIP_AVAILABLE) {
rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y};
rct_xy16 pos = gPaintMapPosition;
paint_struct * backup = gPaintSession.UnkF1AD28;
sint32 height2 = (map_element_height(pos.x + 16, pos.y + 16) & 0xFFFF) + 3;
sub_98196C(SPR_LAND_OWNERSHIP_AVAILABLE, 16, 16, 1, 1, 0, height2, rotation);
@ -1208,7 +1208,7 @@ void surface_paint(uint8 direction, uint16 height, rct_map_element * mapElement)
paint_attach_to_previous_ps(SPR_TERRAIN_SELECTION_DOTTED + byte_97B444[surfaceShape], 0, 0);
} else if (mapElement->properties.surface.ownership & OWNERSHIP_CONSTRUCTION_RIGHTS_AVAILABLE) {
paint_struct * backup = gPaintSession.UnkF1AD28;
rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y};
rct_xy16 pos = gPaintMapPosition;
sint32 height2 = map_element_height(pos.x + 16, pos.y + 16) & 0xFFFF;
sub_98196C(SPR_LAND_CONSTRUCTION_RIGHTS_AVAILABLE, 16, 16, 1, 1, 0, height2 + 3, rotation);
gPaintSession.UnkF1AD28 = backup;
@ -1221,7 +1221,7 @@ void surface_paint(uint8 direction, uint16 height, rct_map_element * mapElement)
if (gMapSelectFlags & MAP_SELECT_FLAG_ENABLE) {
// loc_660FB8:
rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y};
rct_xy16 pos = gPaintMapPosition;
if (pos.x >= gMapSelectPositionA.x &&
pos.x <= gMapSelectPositionB.x &&
pos.y >= gMapSelectPositionA.y &&
@ -1284,7 +1284,7 @@ void surface_paint(uint8 direction, uint16 height, rct_map_element * mapElement)
}
if (gMapSelectFlags & MAP_SELECT_FLAG_ENABLE_CONSTRUCT) {
rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y};
rct_xy16 pos = gPaintMapPosition;
rct_xy16 * tile;
for (tile = gMapSelectionTiles; tile->x != -1; tile++) {

30
src/openrct2/ride/coaster/junior_roller_coaster.c
View File

@ -2090,7 +2090,7 @@ static void junior_rc_flat_to_left_bank_paint_setup(uint8 rideIndex, uint8 track
}
}
const rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y};
const rct_xy16 pos = gPaintMapPosition;
if (track_paint_util_should_paint_supports(pos)) {
sint32 edi = (direction & 1) ? 2 : 1;
metal_a_supports_paint_setup(edi, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
@ -2130,7 +2130,7 @@ static void junior_rc_flat_to_right_bank_paint_setup(uint8 rideIndex, uint8 trac
}
}
const rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y};
const rct_xy16 pos = gPaintMapPosition;
if (track_paint_util_should_paint_supports(pos)) {
sint32 edi = (direction & 1) ? 2 : 1;
metal_a_supports_paint_setup(edi, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
@ -2298,7 +2298,7 @@ static void junior_rc_left_bank_to_25_deg_up_paint_setup(uint8 rideIndex, uint8
}
}
const rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y};
const rct_xy16 pos = gPaintMapPosition;
if (track_paint_util_should_paint_supports(pos)) {
sint32 edi = (direction & 1) ? 2 : 1;
metal_a_supports_paint_setup(edi, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
@ -2341,7 +2341,7 @@ static void junior_rc_right_bank_to_25_deg_up_paint_setup(uint8 rideIndex, uint8
}
}
const rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y};
const rct_xy16 pos = gPaintMapPosition;
if (track_paint_util_should_paint_supports(pos)) {
sint32 edi = (direction & 1) ? 2 : 1;
metal_a_supports_paint_setup(edi, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]);
@ -2399,7 +2399,7 @@ static void junior_rc_25_deg_up_to_left_bank_paint_setup(uint8 rideIndex, uint8
}
}
const rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y};
const rct_xy16 pos = gPaintMapPosition;
if (track_paint_util_should_paint_supports(pos)) {
sint32 edi = (direction & 1) ? 2 : 1;
metal_a_supports_paint_setup(edi, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
@ -2450,7 +2450,7 @@ static void junior_rc_25_deg_up_to_right_bank_paint_setup(uint8 rideIndex, uint8
}
}
const rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y};
const rct_xy16 pos = gPaintMapPosition;
if (track_paint_util_should_paint_supports(pos)) {
sint32 edi = (direction & 1) ? 2 : 1;
metal_a_supports_paint_setup(edi, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]);
@ -2530,7 +2530,7 @@ static void junior_rc_left_bank_paint_setup(uint8 rideIndex, uint8 trackSequence
paint_util_push_tunnel_left(height, 0);
}
const rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y};
const rct_xy16 pos = gPaintMapPosition;
if (track_paint_util_should_paint_supports(pos)) {
sint32 edi = (direction & 1) ? 2 : 1;
metal_a_supports_paint_setup(edi, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
@ -3342,7 +3342,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 = {gPaintMapPosition.x, gPaintMapPosition.y};
const rct_xy16 pos = gPaintMapPosition;
if (track_paint_util_should_paint_supports(pos)) {
sint32 edi = (direction & 1) ? 2 : 1;
metal_a_supports_paint_setup(edi, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
@ -3373,7 +3373,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 = {gPaintMapPosition.x, gPaintMapPosition.y};
const rct_xy16 pos = gPaintMapPosition;
if (track_paint_util_should_paint_supports(pos)) {
sint32 edi = (direction & 1) ? 2 : 1;
metal_a_supports_paint_setup(edi, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);
@ -4296,7 +4296,7 @@ void junior_rc_paint_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8
break;
}
const rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y};
const rct_xy16 pos = gPaintMapPosition;
sint8 support[4] = { 35, 29, 25, 32};
if (track_paint_util_should_paint_supports(pos)) {
@ -4389,7 +4389,7 @@ void junior_rc_paint_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSe
break;
}
const rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y};
const rct_xy16 pos = gPaintMapPosition;
sint8 support[4] = { 12, 12, 12, 14};
if (track_paint_util_should_paint_supports(pos)) {
@ -4461,7 +4461,7 @@ void junior_rc_paint_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSe
break;
}
const rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y};
const rct_xy16 pos = gPaintMapPosition;
if (track_paint_util_should_paint_supports(pos)) {
metal_a_supports_paint_setup((direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, 4, 20, height, gTrackColours[SCHEME_SUPPORTS]);
@ -4705,7 +4705,7 @@ static void junior_rc_flat_to_60_deg_up_paint_setup(uint8 rideIndex, uint8 track
break;
}
const rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y};
const rct_xy16 pos = gPaintMapPosition;
sint8 support[4] = { 12, 12, 12, 14};
if (track_paint_util_should_paint_supports(pos)) {
@ -4774,7 +4774,7 @@ static void junior_rc_60_deg_up_to_flat_paint_setup(uint8 rideIndex, uint8 track
break;
}
const rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y};
const rct_xy16 pos = gPaintMapPosition;
if (track_paint_util_should_paint_supports(pos)) {
metal_a_supports_paint_setup((direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, 4, 20, height - 5, gTrackColours[SCHEME_SUPPORTS]);
@ -4855,7 +4855,7 @@ static void junior_rc_booster_paint_setup(uint8 rideIndex, uint8 trackSequence,
paint_util_push_tunnel_left(height, TUNNEL_0);
}
const rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y};
const rct_xy16 pos = gPaintMapPosition;
if (track_paint_util_should_paint_supports(pos)) {
uint8 supportType = (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK;
metal_a_supports_paint_setup(supportType, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]);

2
src/openrct2/ride/coaster/multi_dimension_roller_coaster.c
View File

@ -94,7 +94,7 @@ static void multi_dimension_rc_track_station(uint8 rideIndex, uint8 trackSequenc
{ 15811, 15813, SPR_STATION_INVERTED_BAR_A_NW_SE },
};
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
rct_xy16 position = gPaintMapPosition;
if (mapElement->properties.track.type == TRACK_ELEM_END_STATION) {
sub_98197C_rotated(direction, imageIds[direction][1] | gTrackColours[SCHEME_TRACK], 0, 0, 32, 26, 1, height, 0, 3, height + 3);

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

@ -420,7 +420,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, sint32 height, rct_map_element * mapElement)
{
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
rct_xy16 position = gPaintMapPosition;
uint32 imageId = car_ride_track_pieces_60_deg_up[direction] | gTrackColours[SCHEME_TRACK];
@ -466,7 +466,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, sint32 height, rct_map_element * mapElement)
{
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
rct_xy16 position = gPaintMapPosition;
uint32 imageId = car_ride_track_pieces_25_deg_up_to_60_deg_up[direction][0] | gTrackColours[SCHEME_TRACK];
@ -512,7 +512,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, sint32 height, rct_map_element * mapElement)
{
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
rct_xy16 position = gPaintMapPosition;
uint32 imageId = car_ride_track_pieces_60_deg_up_to_25_deg_up[direction][0] | gTrackColours[SCHEME_TRACK];

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

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

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

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

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

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

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

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

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

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

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

@ -149,7 +149,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, sint32 height, rct_map_element * mapElement)
{
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
rct_xy16 position = gPaintMapPosition;
uint32 imageId = ghost_train_track_pieces_flat[direction] | gTrackColours[SCHEME_TRACK];
@ -176,7 +176,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, sint32 height, rct_map_element * mapElement)
{
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
rct_xy16 position = gPaintMapPosition;
uint32 imageId = ghost_train_track_pieces_25_deg_up[direction][0] | gTrackColours[SCHEME_TRACK];
if (direction == 0 || direction == 2) {
@ -219,7 +219,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, sint32 height, rct_map_element * mapElement)
{
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
rct_xy16 position = gPaintMapPosition;
uint32 imageId = ghost_train_track_pieces_flat_to_25_deg_up[direction][0] | gTrackColours[SCHEME_TRACK];
if (direction == 0 || direction == 2) {
@ -260,7 +260,7 @@ static void paint_ghost_train_track_flat_to_25_deg_up(uint8 rideIndex, uint8 tra
static void paint_ghost_train_track_25_deg_up_to_flat_shared(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement)
{
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
rct_xy16 position = gPaintMapPosition;
uint32 imageId = ghost_train_track_pieces_25_deg_up_to_flat[direction][0] | gTrackColours[SCHEME_TRACK];
if (direction == 0 || direction == 2) {
@ -438,7 +438,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, sint32 height, rct_map_element * mapElement)
{
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
rct_xy16 position = gPaintMapPosition;
uint32 imageId = ghost_train_track_pieces_brakes[direction] | gTrackColours[SCHEME_TRACK];

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

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

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

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

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

@ -623,7 +623,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, sint32 height, rct_map_element * mapElement)
{
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
rct_xy16 position = gPaintMapPosition;
rct_ride * ride = get_ride(rideIndex);
const rct_ride_entrance_definition * entranceStyle = &RideEntranceDefinitions[ride->entrance_style];
uint32 imageId;

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

@ -59,7 +59,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, sint32 height, rct_map_element * mapElement)
{
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
rct_xy16 position = gPaintMapPosition;
uint32 imageId;
if (direction & 1) {
@ -83,7 +83,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, sint32 height, rct_map_element * mapElement)
{
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
rct_xy16 position = gPaintMapPosition;
uint32 imageId;
switch (direction) {
@ -120,7 +120,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, sint32 height, rct_map_element * mapElement)
{
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
rct_xy16 position = gPaintMapPosition;
uint32 imageId;
switch (direction) {
@ -157,7 +157,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, sint32 height, rct_map_element * mapElement)
{
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
rct_xy16 position = gPaintMapPosition;
uint32 imageId;
switch (direction) {

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

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

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

@ -90,7 +90,7 @@ static void paint_space_rings(uint8 rideIndex, uint8 trackSequence, uint8 direct
sint32 edges = edges_3x3[trackSequence];
rct_ride * ride = get_ride(rideIndex);
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
rct_xy16 position = gPaintMapPosition;
uint32 imageId;

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

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

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

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

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

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

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

@ -314,7 +314,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, sint32 height, rct_map_element * mapElement)
{
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
rct_xy16 position = gPaintMapPosition;
rct_ride * ride = get_ride(rideIndex);
const rct_ride_entrance_definition * entranceStyle = &RideEntranceDefinitions[ride->entrance_style];

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

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

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

@ -161,7 +161,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 = {gPaintMapPosition.x, gPaintMapPosition.y};
rct_xy16 position = gPaintMapPosition;
uint32 imageId;
bool hasFence;

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

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

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

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

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

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

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

@ -304,7 +304,7 @@ void track_paint_util_draw_station_3(uint8 rideIndex, uint8 trackSequence, uint8
void track_paint_util_draw_station_impl(uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, uint16 coverHeight, rct_map_element * mapElement, sint32 fenceOffsetA, sint32 fenceOffsetB)
{
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
rct_xy16 position = gPaintMapPosition;
rct_ride * ride = get_ride(rideIndex);
const rct_ride_entrance_definition * entranceStyle = &RideEntranceDefinitions[ride->entrance_style];
const bool hasGreenLight = map_element_get_green_light(mapElement);
@ -438,7 +438,7 @@ void track_paint_util_draw_station_impl(uint8 rideIndex, uint8 trackSequence, ui
void track_paint_util_draw_station_inverted(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, uint8 stationVariant)
{
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
rct_xy16 position = gPaintMapPosition;
rct_ride * ride = get_ride(rideIndex);
const rct_ride_entrance_definition * entranceStyle = &RideEntranceDefinitions[ride->entrance_style];
const bool hasGreenLight = map_element_get_green_light(mapElement);
@ -647,7 +647,7 @@ bool track_paint_util_draw_station_covers_2(enum edge_t edge, bool hasFence, con
void track_paint_util_draw_station_platform(rct_ride *ride, uint8 direction, sint32 height, sint32 zOffset, rct_map_element * mapElement)
{
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
rct_xy16 position = gPaintMapPosition;
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/openrct2/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, sint32 height, rct_map_element * mapElement)
{
const rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y};
const rct_xy16 pos = gPaintMapPosition;
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, sint32 height, rct_map_element * mapElement)
{
const rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y};
const rct_xy16 pos = gPaintMapPosition;
uint8 trackType = mapElement->properties.track.type;
rct_ride * ride = get_ride(rideIndex);
uint32 imageId;

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

@ -79,7 +79,7 @@ static void paint_lift_base(uint8 rideIndex, uint8 trackSequence, uint8 directio
sint32 edges = edges_3x3[trackSequence];
rct_ride * ride = get_ride(rideIndex);
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
rct_xy16 position = gPaintMapPosition;
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/openrct2/ride/transport/monorail.c
View File

@ -443,7 +443,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, sint32 height, rct_map_element * mapElement)
{
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
rct_xy16 position = gPaintMapPosition;
uint32 imageId = monorail_track_pieces_flat[direction] | gTrackColours[SCHEME_TRACK];
@ -510,7 +510,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, sint32 height, rct_map_element * mapElement)
{
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
rct_xy16 position = gPaintMapPosition;
uint32 imageId = monorail_track_pieces_25_deg_up[direction] | gTrackColours[SCHEME_TRACK];
@ -538,7 +538,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, sint32 height, rct_map_element * mapElement)
{
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
rct_xy16 position = gPaintMapPosition;
uint32 imageId = monorail_track_pieces_flat_to_25_deg_up[direction] | gTrackColours[SCHEME_TRACK];
@ -566,7 +566,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, sint32 height, rct_map_element * mapElement)
{
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
rct_xy16 position = gPaintMapPosition;
uint32 imageId = monorail_track_pieces_25_deg_up_to_flat[direction] | gTrackColours[SCHEME_TRACK];

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

@ -62,7 +62,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, sint32 height, rct_map_element * mapElement)
{
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
rct_xy16 position = gPaintMapPosition;
rct_ride * ride = get_ride(rideIndex);
const rct_ride_entrance_definition * entranceStyle = &RideEntranceDefinitions[ride->entrance_style];

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

@ -70,7 +70,7 @@ void vehicle_visual_submarine(sint32 x, sint32 imageDirection, sint32 y, sint32
static void submarine_ride_paint_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement)
{
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
rct_xy16 position = gPaintMapPosition;
rct_ride * ride = get_ride(rideIndex);
const rct_ride_entrance_definition * entranceStyle = &RideEntranceDefinitions[ride->entrance_style];
sint32 heightLower = height - 16;
@ -96,7 +96,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, sint32 height, rct_map_element * mapElement)
{
rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y};
rct_xy16 position = gPaintMapPosition;
sint32 heightLower = height - 16;
uint32 imageId;