From bcfd66cbc601cbde3d7d3eb1f9084ea41fe89562 Mon Sep 17 00:00:00 2001 From: Hielke Morsink Date: Wed, 20 Dec 2017 14:35:43 +0100 Subject: [PATCH] Use nullptr instead of 0 --- src/openrct2/Game.cpp | 14 ++-- src/openrct2/network/NetworkPlayer.h | 2 +- src/openrct2/paint/Paint.cpp | 4 +- src/openrct2/paint/tile_element/Surface.cpp | 2 +- src/openrct2/peep/Peep.cpp | 4 +- src/openrct2/ride/TrackData.cpp | 10 +-- .../ride/coaster/JuniorRollerCoaster.cpp | 66 +++++++++---------- 7 files changed, 51 insertions(+), 51 deletions(-) diff --git a/src/openrct2/Game.cpp b/src/openrct2/Game.cpp index ba97399d6c..d40a1ebd08 100644 --- a/src/openrct2/Game.cpp +++ b/src/openrct2/Game.cpp @@ -82,10 +82,10 @@ uint8 gUnk141F568; uint32 gCurrentTicks; -GAME_COMMAND_CALLBACK_POINTER * game_command_callback = 0; +GAME_COMMAND_CALLBACK_POINTER * game_command_callback = nullptr; static GAME_COMMAND_CALLBACK_POINTER * const game_command_callback_table[] = { - 0, - 0, + nullptr, + nullptr, game_command_callback_ride_construct_placed_front, game_command_callback_ride_construct_placed_back, game_command_callback_ride_remove_track_piece, @@ -121,7 +121,7 @@ GAME_COMMAND_CALLBACK_POINTER * game_command_callback_get_callback(uint32 index) { return game_command_callback_table[index]; } - return 0; + return nullptr; } void game_increase_game_speed() @@ -661,7 +661,7 @@ sint32 game_do_command_p(uint32 command, sint32 * eax, sint32 * ebx, sint32 * ec if (network_get_mode() == NETWORK_MODE_CLIENT) { // Client sent the command to the server, do not run it locally, just return. It will run when server sends it. - game_command_callback = 0; + game_command_callback = nullptr; // Decrement nest count gGameCommandNestLevel--; return cost; @@ -678,7 +678,7 @@ sint32 game_do_command_p(uint32 command, sint32 * eax, sint32 * ebx, sint32 * ec if (game_command_callback && !(flags & GAME_COMMAND_FLAG_GHOST)) { game_command_callback(*eax, *ebx, *ecx, *edx, *esi, *edi, *ebp); - game_command_callback = 0; + game_command_callback = nullptr; } } @@ -727,7 +727,7 @@ sint32 game_do_command_p(uint32 command, sint32 * eax, sint32 * ebx, sint32 * ec gGameCommandNestLevel--; // Clear the game command callback to prevent the next command triggering it - game_command_callback = 0; + game_command_callback = nullptr; // Show error window if (gGameCommandNestLevel == 0 && (flags & GAME_COMMAND_FLAG_APPLY) && gUnk141F568 == gUnk13CA740 && !(flags & GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED) && !(flags & GAME_COMMAND_FLAG_NETWORKED)) diff --git a/src/openrct2/network/NetworkPlayer.h b/src/openrct2/network/NetworkPlayer.h index 5740e191e6..2558eab9ff 100644 --- a/src/openrct2/network/NetworkPlayer.h +++ b/src/openrct2/network/NetworkPlayer.h @@ -40,7 +40,7 @@ public: sint32 LastAction = -999; uint32 LastActionTime = 0; LocationXYZ16 LastActionCoord = { 0 }; - rct_peep* PickupPeep = 0; + rct_peep* PickupPeep = nullptr; sint32 PickupPeepOldX = LOCATION_NULL; std::string KeyHash; uint32 LastDemolishRideTime = 0; diff --git a/src/openrct2/paint/Paint.cpp b/src/openrct2/paint/Paint.cpp index 905169c0fe..53c4b0ab62 100644 --- a/src/openrct2/paint/Paint.cpp +++ b/src/openrct2/paint/Paint.cpp @@ -490,7 +490,7 @@ void paint_draw_structs(rct_drawpixelinfo * dpi, paint_struct * ps, uint32 viewF paint_ps_image(dpi, ps, imageId, x, y); } - if (ps->var_20 != 0) + if (ps->var_20 != nullptr) { // NOTE: RCT uses var_20 instead of next_quadrant_ps, do we still need it? ps = ps->var_20; @@ -1133,7 +1133,7 @@ extern "C" paint_string_struct * ps = &session->NextFreePaintStruct->string; ps->string_id = string_id; - ps->next = 0; + ps->next = nullptr; ps->args[0] = amount; ps->args[1] = y; ps->args[2] = 0; diff --git a/src/openrct2/paint/tile_element/Surface.cpp b/src/openrct2/paint/tile_element/Surface.cpp index 0ad1c146d1..6daaa7bcc9 100644 --- a/src/openrct2/paint/tile_element/Surface.cpp +++ b/src/openrct2/paint/tile_element/Surface.cpp @@ -583,7 +583,7 @@ static void viewport_surface_draw_tile_side_bottom(paint_session * session, enum if (isWater) regs.dl = height; - if (neighbour.tile_element == 0) + if (neighbour.tile_element == nullptr) { regs.ch = 1; regs.ah = 1; diff --git a/src/openrct2/peep/Peep.cpp b/src/openrct2/peep/Peep.cpp index dd64f9bfb1..6109aa81d2 100644 --- a/src/openrct2/peep/Peep.cpp +++ b/src/openrct2/peep/Peep.cpp @@ -2116,7 +2116,7 @@ bool peep_pickup_place(rct_peep * peep, sint32 x, sint32 y, sint32 z, bool apply peep_update_current_action_sprite_type(peep); } - network_set_pickup_peep(game_command_playerid, 0); + network_set_pickup_peep(game_command_playerid, nullptr); } return true; @@ -2170,7 +2170,7 @@ bool peep_pickup_command(uint32 peepnum, sint32 x, sint32 y, sint32 z, sint32 ac if (apply) { peep_pickup_abort(network_get_pickup_peep(game_command_playerid), x); - network_set_pickup_peep(game_command_playerid, 0); + network_set_pickup_peep(game_command_playerid, nullptr); } break; case 2: // place diff --git a/src/openrct2/ride/TrackData.cpp b/src/openrct2/ride/TrackData.cpp index 5135aff029..e4ef214d1a 100644 --- a/src/openrct2/ride/TrackData.cpp +++ b/src/openrct2/ride/TrackData.cpp @@ -6303,15 +6303,15 @@ const TRACK_PAINT_FUNCTION_GETTER RideTypeTrackPaintFunctions[RIDE_TYPE_COUNT] = get_track_paint_function_side_friction_rc, // RIDE_TYPE_SIDE_FRICTION_ROLLER_COASTER get_track_paint_function_wild_mouse, // RIDE_TYPE_STEEL_WILD_MOUSE get_track_paint_function_multi_dimension_rc, // RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER - 0, // RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER_ALT + nullptr, // RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER_ALT get_track_paint_function_flying_rc, // RIDE_TYPE_FLYING_ROLLER_COASTER - 0, // RIDE_TYPE_FLYING_ROLLER_COASTER_ALT + nullptr, // RIDE_TYPE_FLYING_ROLLER_COASTER_ALT get_track_paint_function_virginia_reel, // RIDE_TYPE_VIRGINIA_REEL get_track_paint_function_splash_boats, // RIDE_TYPE_SPLASH_BOATS get_track_paint_function_mini_helicopters, // RIDE_TYPE_MINI_HELICOPTERS get_track_paint_function_lay_down_rc, // RIDE_TYPE_LAY_DOWN_ROLLER_COASTER get_track_paint_function_suspended_monorail, // RIDE_TYPE_SUSPENDED_MONORAIL - 0, // RIDE_TYPE_LAY_DOWN_ROLLER_COASTER_ALT + nullptr, // RIDE_TYPE_LAY_DOWN_ROLLER_COASTER_ALT get_track_paint_function_reverser_rc, // RIDE_TYPE_REVERSER_ROLLER_COASTER get_track_paint_function_heartline_twister_rc, // RIDE_TYPE_HEARTLINE_TWISTER_COASTER get_track_paint_function_mini_golf, // RIDE_TYPE_MINI_GOLF @@ -6332,11 +6332,11 @@ const TRACK_PAINT_FUNCTION_GETTER RideTypeTrackPaintFunctions[RIDE_TYPE_COUNT] = get_track_paint_function_shop, // RIDE_TYPE_52 get_track_paint_function_shop, // RIDE_TYPE_53 get_track_paint_function_shop, // RIDE_TYPE_54 - 0, // RIDE_TYPE_55 + nullptr, // RIDE_TYPE_55 get_track_paint_function_inverted_impulse_rc, // RIDE_TYPE_INVERTED_IMPULSE_COASTER get_track_paint_function_mini_rc, // RIDE_TYPE_MINI_ROLLER_COASTER get_track_paint_function_mine_ride, // RIDE_TYPE_MINE_RIDE - 0, // RIDE_TYPE_59 + nullptr, // RIDE_TYPE_59 get_track_paint_function_lim_launched_rc, // RIDE_TYPE_LIM_LAUNCHED_ROLLER_COASTER }; diff --git a/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp b/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp index 7bfe90f03b..7e86b2218b 100644 --- a/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp @@ -3655,7 +3655,7 @@ static void junior_rc_left_eighth_to_diag_paint_setup(paint_session * session, u { track_paint_util_eighth_to_diag_tiles_paint(session, defaultEighthToDiagThickness, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], junior_rc_track_pieces_left_eight_to_diag, - 0, defaultLeftEighthToDiagBoundLengths, defaultLeftEighthToDiagBoundOffsets, + nullptr, defaultLeftEighthToDiagBoundLengths, defaultLeftEighthToDiagBoundOffsets, get_current_rotation()); switch (trackSequence) @@ -3717,7 +3717,7 @@ static void junior_rc_right_eighth_to_diag_paint_setup(paint_session * session, { track_paint_util_eighth_to_diag_tiles_paint(session, defaultEighthToDiagThickness, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], junior_rc_track_pieces_right_eight_to_diag, - 0, defaultRightEighthToDiagBoundLengths, defaultRightEighthToDiagBoundOffsets, + nullptr, defaultRightEighthToDiagBoundLengths, defaultRightEighthToDiagBoundOffsets, get_current_rotation()); switch (trackSequence) @@ -3878,7 +3878,7 @@ static void junior_rc_left_eighth_to_diag_bank_paint_setup(paint_session * sessi { track_paint_util_eighth_to_diag_tiles_paint(session, junior_rc_left_eighth_to_diag_bank_thickness, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], - junior_rc_track_pieces_left_eight_to_diag_bank, 0, + junior_rc_track_pieces_left_eight_to_diag_bank, nullptr, junior_rc_left_eighth_to_diag_bank_bound_lengths, junior_rc_left_eighth_to_diag_bank_bound_offsets, get_current_rotation()); @@ -4022,7 +4022,7 @@ static void junior_rc_right_eighth_to_diag_bank_paint_setup(paint_session * sess { track_paint_util_eighth_to_diag_tiles_paint(session, junior_rc_right_eighth_to_diag_bank_thickness, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], - junior_rc_track_pieces_right_eight_to_diag_bank, 0, + junior_rc_track_pieces_right_eight_to_diag_bank, nullptr, junior_rc_right_eighth_to_diag_bank_bound_lengths, junior_rc_right_eighth_to_diag_bank_bound_offsets, get_current_rotation()); @@ -4109,7 +4109,7 @@ void junior_rc_paint_track_diag_flat(paint_session * session, uint8 rideIndex, u { track_paint_util_diag_tiles_paint(session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_flat[chainType], defaultDiagTileOffsets, - defaultDiagBoundLengths, 0, get_current_rotation()); + defaultDiagBoundLengths, nullptr, get_current_rotation()); if (trackSequence == 3) { @@ -4128,7 +4128,7 @@ void junior_rc_paint_track_diag_25_deg_up(paint_session * session, uint8 rideInd { track_paint_util_diag_tiles_paint(session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_25_deg_up[chainType], defaultDiagTileOffsets, - defaultDiagBoundLengths, 0, get_current_rotation()); + defaultDiagBoundLengths, nullptr, get_current_rotation()); if (trackSequence == 3) { @@ -4147,7 +4147,7 @@ void junior_rc_paint_track_diag_flat_to_25_deg_up(paint_session * session, uint8 { track_paint_util_diag_tiles_paint(session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_flat_to_25_deg_up[chainType], defaultDiagTileOffsets, - defaultDiagBoundLengths, 0, get_current_rotation()); + defaultDiagBoundLengths, nullptr, get_current_rotation()); if (trackSequence == 3) { @@ -4169,7 +4169,7 @@ void junior_rc_paint_track_diag_flat_to_60_deg_up(paint_session * session, uint8 track_paint_util_diag_tiles_paint(session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_flat_to_60_deg_up[chainType], defaultDiagTileOffsets, - defaultDiagBoundLengths, 0, get_current_rotation()); + defaultDiagBoundLengths, nullptr, get_current_rotation()); if (trackSequence == 3) { @@ -4188,7 +4188,7 @@ void junior_rc_paint_track_diag_25_deg_up_to_flat(paint_session * session, uint8 { track_paint_util_diag_tiles_paint(session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_25_deg_up_to_flat[chainType], defaultDiagTileOffsets, - defaultDiagBoundLengths, 0, get_current_rotation()); + defaultDiagBoundLengths, nullptr, get_current_rotation()); if (trackSequence == 3) { @@ -4210,7 +4210,7 @@ void junior_rc_paint_track_diag_60_deg_up_to_flat(paint_session * session, uint8 track_paint_util_diag_tiles_paint(session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_60_deg_up_to_flat[chainType], defaultDiagTileOffsets, - defaultDiagBoundLengths, 0, get_current_rotation()); + defaultDiagBoundLengths, nullptr, get_current_rotation()); if (trackSequence == 3) { @@ -4229,7 +4229,7 @@ void junior_rc_paint_track_diag_25_deg_down(paint_session * session, uint8 rideI track_paint_util_diag_tiles_paint(session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_25_deg_down[chainType], defaultDiagTileOffsets, - defaultDiagBoundLengths, 0, get_current_rotation()); + defaultDiagBoundLengths, nullptr, get_current_rotation()); if (trackSequence == 3) { @@ -4248,7 +4248,7 @@ void junior_rc_paint_track_diag_flat_to_25_deg_down(paint_session * session, uin { track_paint_util_diag_tiles_paint(session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_flat_to_25_deg_down[chainType], defaultDiagTileOffsets, - defaultDiagBoundLengths, 0, get_current_rotation()); + defaultDiagBoundLengths, nullptr, get_current_rotation()); if (trackSequence == 3) { @@ -4270,7 +4270,7 @@ void junior_rc_paint_track_diag_flat_to_60_deg_down(paint_session * session, uin track_paint_util_diag_tiles_paint(session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_flat_to_60_deg_down[chainType], defaultDiagTileOffsets, - defaultDiagBoundLengths, 0, get_current_rotation()); + defaultDiagBoundLengths, nullptr, get_current_rotation()); if (trackSequence == 3) { @@ -4289,7 +4289,7 @@ void junior_rc_paint_track_diag_25_deg_down_to_flat(paint_session * session, uin { track_paint_util_diag_tiles_paint(session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_25_deg_down_to_flat[chainType], defaultDiagTileOffsets, - defaultDiagBoundLengths, 0, get_current_rotation()); + defaultDiagBoundLengths, nullptr, get_current_rotation()); if (trackSequence == 3) { @@ -4311,7 +4311,7 @@ void junior_rc_paint_track_diag_60_deg_down_to_flat(paint_session * session, uin track_paint_util_diag_tiles_paint(session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_60_deg_down_to_flat[chainType], defaultDiagTileOffsets, - defaultDiagBoundLengths, 0, get_current_rotation()); + defaultDiagBoundLengths, nullptr, get_current_rotation()); if (trackSequence == 3) { @@ -4425,7 +4425,7 @@ static void junior_rc_diag_flat_to_left_bank_paint_setup(paint_session * session { track_paint_util_diag_tiles_paint(session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_flat_to_left_bank, defaultDiagTileOffsets, - defaultDiagBoundLengths, 0, get_current_rotation()); + defaultDiagBoundLengths, nullptr, get_current_rotation()); if (direction == 0 && trackSequence == 1) { @@ -4451,7 +4451,7 @@ static void junior_rc_diag_flat_to_right_bank_paint_setup(paint_session * sessio { track_paint_util_diag_tiles_paint(session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_flat_to_right_bank, defaultDiagTileOffsets, - defaultDiagBoundLengths, 0, get_current_rotation()); + defaultDiagBoundLengths, nullptr, get_current_rotation()); if (direction == 2 && trackSequence == 2) { @@ -4477,7 +4477,7 @@ static void junior_rc_diag_left_bank_to_flat_paint_setup(paint_session * session { track_paint_util_diag_tiles_paint(session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_left_bank_to_flat, defaultDiagTileOffsets, - defaultDiagBoundLengths, 0, get_current_rotation()); + defaultDiagBoundLengths, nullptr, get_current_rotation()); if (direction == 0 && trackSequence == 1) { @@ -4503,7 +4503,7 @@ static void junior_rc_diag_right_bank_to_flat_paint_setup(paint_session * sessio { track_paint_util_diag_tiles_paint(session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_right_bank_to_flat, defaultDiagTileOffsets, - defaultDiagBoundLengths, 0, get_current_rotation()); + defaultDiagBoundLengths, nullptr, get_current_rotation()); if (direction == 2 && trackSequence == 2) { @@ -4529,7 +4529,7 @@ static void junior_rc_diag_left_bank_to_25_deg_up_paint_setup(paint_session * se { track_paint_util_diag_tiles_paint(session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_left_bank_to_25_deg_up, defaultDiagTileOffsets, - defaultDiagBoundLengths, 0, get_current_rotation()); + defaultDiagBoundLengths, nullptr, get_current_rotation()); if (direction == 0 && trackSequence == 1) { @@ -4554,7 +4554,7 @@ static void junior_rc_diag_right_bank_to_25_deg_up_paint_setup(paint_session * s { track_paint_util_diag_tiles_paint(session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_right_bank_to_25_deg_up, defaultDiagTileOffsets, - defaultDiagBoundLengths, 0, get_current_rotation()); + defaultDiagBoundLengths, nullptr, get_current_rotation()); if (direction == 2 && trackSequence == 2) { @@ -4579,7 +4579,7 @@ static void junior_rc_diag_25_deg_up_to_left_bank_paint_setup(paint_session * se { track_paint_util_diag_tiles_paint(session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_25_deg_up_to_left_bank, defaultDiagTileOffsets, - defaultDiagBoundLengths, 0, get_current_rotation()); + defaultDiagBoundLengths, nullptr, get_current_rotation()); if (direction == 0 && trackSequence == 1) { @@ -4604,7 +4604,7 @@ static void junior_rc_diag_25_deg_up_to_right_bank_paint_setup(paint_session * s { track_paint_util_diag_tiles_paint(session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_25_deg_up_to_right_bank, defaultDiagTileOffsets, - defaultDiagBoundLengths, 0, get_current_rotation()); + defaultDiagBoundLengths, nullptr, get_current_rotation()); if (direction == 2 && trackSequence == 2) { @@ -4629,7 +4629,7 @@ static void junior_rc_diag_left_bank_to_25_deg_down_paint_setup(paint_session * { track_paint_util_diag_tiles_paint(session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_left_bank_to_25_deg_down, defaultDiagTileOffsets, - defaultDiagBoundLengths, 0, get_current_rotation()); + defaultDiagBoundLengths, nullptr, get_current_rotation()); if (direction == 0 && trackSequence == 1) { @@ -4654,7 +4654,7 @@ static void junior_rc_diag_right_bank_to_25_deg_down_paint_setup(paint_session * { track_paint_util_diag_tiles_paint(session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_right_bank_to_25_deg_down, defaultDiagTileOffsets, - defaultDiagBoundLengths, 0, get_current_rotation()); + defaultDiagBoundLengths, nullptr, get_current_rotation()); if (direction == 2 && trackSequence == 2) { @@ -4679,7 +4679,7 @@ static void junior_rc_diag_25_deg_down_to_left_bank_paint_setup(paint_session * { track_paint_util_diag_tiles_paint(session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_25_deg_down_to_left_bank, defaultDiagTileOffsets, - defaultDiagBoundLengths, 0, get_current_rotation()); + defaultDiagBoundLengths, nullptr, get_current_rotation()); if (direction == 0 && trackSequence == 1) { @@ -4704,7 +4704,7 @@ static void junior_rc_diag_25_deg_down_to_right_bank_paint_setup(paint_session * { track_paint_util_diag_tiles_paint(session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_25_deg_down_to_right_bank, defaultDiagTileOffsets, - defaultDiagBoundLengths, 0, get_current_rotation()); + defaultDiagBoundLengths, nullptr, get_current_rotation()); if (direction == 2 && trackSequence == 2) { @@ -5029,7 +5029,7 @@ void junior_rc_paint_track_diag_60_deg_up(paint_session * session, uint8 rideInd { track_paint_util_diag_tiles_paint(session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_60_deg_up[chainType], defaultDiagTileOffsets, - defaultDiagBoundLengths, 0, get_current_rotation()); + defaultDiagBoundLengths, nullptr, get_current_rotation()); if (trackSequence == 3) { @@ -5047,7 +5047,7 @@ void junior_rc_paint_track_diag_60_deg_down(paint_session * session, uint8 rideI { track_paint_util_diag_tiles_paint(session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_60_deg_down[chainType], defaultDiagTileOffsets, - defaultDiagBoundLengths, 0, get_current_rotation()); + defaultDiagBoundLengths, nullptr, get_current_rotation()); if (trackSequence == 3) { @@ -5066,7 +5066,7 @@ void junior_rc_paint_track_diag_25_deg_up_to_60_deg_up(paint_session * session, { track_paint_util_diag_tiles_paint(session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_25_deg_up_to_60_deg_up[chainType], defaultDiagTileOffsets, - defaultDiagBoundLengths, 0, get_current_rotation()); + defaultDiagBoundLengths, nullptr, get_current_rotation()); if (trackSequence == 3) { @@ -5094,7 +5094,7 @@ void junior_rc_paint_track_diag_60_deg_up_to_25_deg_up(paint_session * session, { track_paint_util_diag_tiles_paint(session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_60_deg_up_to_25_deg_up[chainType], defaultDiagTileOffsets, - defaultDiagBoundLengths, 0, get_current_rotation()); + defaultDiagBoundLengths, nullptr, get_current_rotation()); } if (trackSequence == 3) @@ -5123,7 +5123,7 @@ void junior_rc_paint_track_diag_25_deg_down_to_60_deg_down(paint_session * sessi { track_paint_util_diag_tiles_paint(session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_25_deg_down_to_60_deg_down[chainType], - defaultDiagTileOffsets, defaultDiagBoundLengths, 0, get_current_rotation()); + defaultDiagTileOffsets, defaultDiagBoundLengths, nullptr, get_current_rotation()); } if (trackSequence == 3) @@ -5143,7 +5143,7 @@ void junior_rc_paint_track_diag_60_deg_down_to_25_deg_down(paint_session * sessi { track_paint_util_diag_tiles_paint(session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_60_deg_down_to_25_deg_down[chainType], defaultDiagTileOffsets, - defaultDiagBoundLengths, 0, get_current_rotation()); + defaultDiagBoundLengths, nullptr, get_current_rotation()); if (trackSequence == 3) {