From e6d5638815cd458e7babeba4c29b756356cdeb1c Mon Sep 17 00:00:00 2001 From: Michael Steenbeek Date: Tue, 18 Sep 2018 13:30:00 +0200 Subject: [PATCH] Move inverted() functions to struct methods --- src/openrct2-ui/windows/RideConstruction.cpp | 2 +- src/openrct2/ride/Ride.cpp | 6 +- src/openrct2/ride/Track.cpp | 40 ++--- src/openrct2/ride/Track.h | 2 - src/openrct2/ride/TrackDesignSave.cpp | 2 +- src/openrct2/ride/Vehicle.cpp | 10 +- .../ride/coaster/FlyingRollerCoaster.cpp | 162 +++++++++--------- .../ride/coaster/LayDownRollerCoaster.cpp | 126 +++++++------- .../coaster/MultiDimensionRollerCoaster.cpp | 128 +++++++------- src/openrct2/world/TileElement.h | 3 + test/testpaint/Compat.cpp | 17 -- test/testpaint/generate.cpp | 4 +- 12 files changed, 243 insertions(+), 259 deletions(-) diff --git a/src/openrct2-ui/windows/RideConstruction.cpp b/src/openrct2-ui/windows/RideConstruction.cpp index 8ad87b8233..6e43e8f9fa 100644 --- a/src/openrct2-ui/windows/RideConstruction.cpp +++ b/src/openrct2-ui/windows/RideConstruction.cpp @@ -2427,7 +2427,7 @@ static void sub_6CBCE2( _tempTrackTileElement.AsTrack()->SetTrackType(trackType); _tempTrackTileElement.AsTrack()->SetSequenceIndex(trackBlock->index); _tempTrackTileElement.AsTrack()->SetHasCableLift(false); - track_element_set_inverted(&_tempTrackTileElement, (edx & 0x20000) ? true : false); + _tempTrackTileElement.AsTrack()->SetInverted((edx & 0x20000) ? true : false); _tempTrackTileElement.AsTrack()->SetColourScheme(RIDE_COLOUR_SCHEME_MAIN); // Skipping seat rotation, should not be necessary for a temporary piece. _tempTrackTileElement.AsTrack()->SetRideIndex(rideIndex); diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index 71d8bc5ac8..dfdfebf93a 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -1605,7 +1605,7 @@ void ride_construction_set_default_next_piece() _currentTrackAlternative &= ~RIDE_TYPE_ALTERNATIVE_TRACK_TYPE; if (RideData4[ride->type].flags & RIDE_TYPE_FLAG4_HAS_ALTERNATIVE_TRACK_TYPE) { - if (track_element_is_inverted(tileElement)) + if (tileElement->AsTrack()->IsInverted()) { _currentTrackAlternative |= RIDE_TYPE_ALTERNATIVE_TRACK_TYPE; } @@ -1672,7 +1672,7 @@ void ride_construction_set_default_next_piece() _currentTrackAlternative &= ~RIDE_TYPE_ALTERNATIVE_TRACK_TYPE; if (RideData4[ride->type].flags & RIDE_TYPE_FLAG4_HAS_ALTERNATIVE_TRACK_TYPE) { - if (track_element_is_inverted(tileElement)) + if (tileElement->AsTrack()->IsInverted()) { _currentTrackAlternative |= RIDE_TYPE_ALTERNATIVE_TRACK_TYPE; } @@ -4980,7 +4980,7 @@ static rct_vehicle* vehicle_create_car( vehicle->update_flags = VEHICLE_UPDATE_FLAG_1; if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_HAS_INVERTED_SPRITE_SET) { - if (track_element_is_inverted(tileElement)) + if (tileElement->AsTrack()->IsInverted()) { vehicle->update_flags |= VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES; } diff --git a/src/openrct2/ride/Track.cpp b/src/openrct2/ride/Track.cpp index 8205a2bd5f..04e6dd587d 100644 --- a/src/openrct2/ride/Track.cpp +++ b/src/openrct2/ride/Track.cpp @@ -1492,7 +1492,7 @@ static money32 track_place( if (liftHillAndAlternativeState & RIDE_TYPE_ALTERNATIVE_TRACK_TYPE) { - track_element_set_inverted(tileElement, true); + tileElement->AsTrack()->SetInverted(true); } tileElement->AsTrack()->SetColourScheme(colour); @@ -2099,27 +2099,10 @@ bool track_element_is_block_start(rct_tile_element* trackElement) return false; } -bool track_element_is_inverted(const rct_tile_element* tileElement) -{ - return tileElement->properties.track.colour & TRACK_ELEMENT_COLOUR_FLAG_INVERTED; -} - -void track_element_set_inverted(rct_tile_element* tileElement, bool inverted) -{ - if (inverted) - { - tileElement->properties.track.colour |= TRACK_ELEMENT_COLOUR_FLAG_INVERTED; - } - else - { - tileElement->properties.track.colour &= ~TRACK_ELEMENT_COLOUR_FLAG_INVERTED; - } -} - int32_t track_get_actual_bank(rct_tile_element* tileElement, int32_t bank) { Ride* ride = get_ride(tileElement->AsTrack()->GetRideIndex()); - bool isInverted = track_element_is_inverted(tileElement); + bool isInverted = tileElement->AsTrack()->IsInverted(); return track_get_actual_bank_2(ride->type, isInverted, bank); } @@ -2145,7 +2128,7 @@ int32_t track_get_actual_bank_2(int32_t rideType, bool isInverted, int32_t bank) int32_t track_get_actual_bank_3(rct_vehicle* vehicle, rct_tile_element* tileElement) { bool isInverted = ((vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) > 0) - ^ track_element_is_inverted(tileElement); + ^ tileElement->AsTrack()->IsInverted(); int32_t trackType = tileElement->AsTrack()->GetTrackType(); int32_t rideType = get_ride(tileElement->AsTrack()->GetRideIndex())->type; int32_t bankStart = TrackDefinitions[trackType].bank_start; @@ -2353,3 +2336,20 @@ void TrackElement::SetHasCableLift(bool on) if (on) colour |= TRACK_ELEMENT_COLOUR_FLAG_CABLE_LIFT; } + +bool TrackElement::IsInverted() const +{ + return colour & TRACK_ELEMENT_COLOUR_FLAG_INVERTED; +} + +void TrackElement::SetInverted(bool inverted) +{ + if (inverted) + { + colour |= TRACK_ELEMENT_COLOUR_FLAG_INVERTED; + } + else + { + colour &= ~TRACK_ELEMENT_COLOUR_FLAG_INVERTED; + } +} \ No newline at end of file diff --git a/src/openrct2/ride/Track.h b/src/openrct2/ride/Track.h index 58708e4c95..06e0983c9a 100644 --- a/src/openrct2/ride/Track.h +++ b/src/openrct2/ride/Track.h @@ -540,8 +540,6 @@ void track_get_front(CoordsXYE* input, CoordsXYE* output); bool track_element_is_block_start(rct_tile_element* trackElement); bool track_element_is_covered(int32_t trackElementType); bool track_element_is_station(rct_tile_element* trackElement); -bool track_element_is_inverted(const rct_tile_element* tileElement); -void track_element_set_inverted(rct_tile_element* tileElement, bool inverted); int32_t track_get_actual_bank(rct_tile_element* tileElement, int32_t bank); int32_t track_get_actual_bank_2(int32_t rideType, bool isInverted, int32_t bank); diff --git a/src/openrct2/ride/TrackDesignSave.cpp b/src/openrct2/ride/TrackDesignSave.cpp index 9662f9ab85..9c3ecf0465 100644 --- a/src/openrct2/ride/TrackDesignSave.cpp +++ b/src/openrct2/ride/TrackDesignSave.cpp @@ -1058,7 +1058,7 @@ static bool track_design_save_to_td6_for_tracked_ride(uint8_t rideIndex, rct_tra uint8_t flags = (trackElement.element->type & (1 << 7)) | bh; flags |= trackElement.element->AsTrack()->GetColourScheme() << 4; if (RideData4[ride->type].flags & RIDE_TYPE_FLAG4_HAS_ALTERNATIVE_TRACK_TYPE - && track_element_is_inverted(trackElement.element)) + && tileElement->AsTrack()->IsInverted()) { flags |= TRACK_ELEMENT_FLAG_INVERTED; } diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp index 3f549ff11e..9d8c50c4d2 100644 --- a/src/openrct2/ride/Vehicle.cpp +++ b/src/openrct2/ride/Vehicle.cpp @@ -8053,7 +8053,7 @@ loc_6DB358: int32_t rideType = get_ride(tileElement->AsTrack()->GetRideIndex())->type; if (RideData4[rideType].flags & RIDE_TYPE_FLAG4_HAS_ALTERNATIVE_TRACK_TYPE) { - if (track_element_is_inverted(tileElement)) + if (tileElement->AsTrack()->IsInverted()) { vehicle->update_flags |= VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES; } @@ -8434,7 +8434,7 @@ static bool vehicle_update_track_motion_backwards_get_new_track( } bool isInverted = ((vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) > 0) - ^ track_element_is_inverted(tileElement); + ^ tileElement->AsTrack()->IsInverted(); int32_t bank = TrackDefinitions[trackType].bank_end; bank = track_get_actual_bank_2(ride->type, isInverted, bank); int32_t vAngle = TrackDefinitions[trackType].vangle_end; @@ -8447,7 +8447,7 @@ static bool vehicle_update_track_motion_backwards_get_new_track( vehicle->update_flags &= ~VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES; if (RideData4[ride->type].flags & RIDE_TYPE_FLAG4_HAS_ALTERNATIVE_TRACK_TYPE) { - if (track_element_is_inverted(tileElement)) + if (tileElement->AsTrack()->IsInverted()) { vehicle->update_flags |= VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES; } @@ -8880,7 +8880,7 @@ loc_6DC476: vehicle->update_flags &= ~VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES; if (RideData4[rideType].flags & RIDE_TYPE_FLAG4_HAS_ALTERNATIVE_TRACK_TYPE) { - if (track_element_is_inverted(tileElement)) + if (tileElement->AsTrack()->IsInverted()) { vehicle->update_flags |= VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES; } @@ -9131,7 +9131,7 @@ loc_6DCA9A: vehicle->update_flags &= ~VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES; if (RideData4[rideType].flags & RIDE_TYPE_FLAG4_HAS_ALTERNATIVE_TRACK_TYPE) { - if (track_element_is_inverted(tileElement)) + if (tileElement->AsTrack()->IsInverted()) { vehicle->update_flags |= VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES; } diff --git a/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp b/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp index e26bb4f590..7224166ec8 100644 --- a/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp @@ -24,7 +24,7 @@ static void flying_rc_track_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { if (tileElement->AsTrack()->HasChain()) { @@ -136,7 +136,7 @@ static void flying_rc_track_station( paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (track_element_is_inverted(tileElement)) + if (tileElement->AsTrack()->IsInverted()) { static constexpr const uint32_t imageIds[4][3] = { { SPR_STATION_BASE_C_SW_NE, 27131, SPR_STATION_INVERTED_BAR_C_SW_NE }, @@ -193,7 +193,7 @@ static void flying_rc_track_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -328,7 +328,7 @@ static void flying_rc_track_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -410,7 +410,7 @@ static void flying_rc_track_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -545,7 +545,7 @@ static void flying_rc_track_25_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -637,7 +637,7 @@ static void flying_rc_track_60_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -753,7 +753,7 @@ static void flying_rc_track_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -936,7 +936,7 @@ static void flying_rc_track_left_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -1314,7 +1314,7 @@ static void flying_rc_track_flat_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -1395,7 +1395,7 @@ static void flying_rc_track_flat_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -1476,7 +1476,7 @@ static void flying_rc_track_left_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -1557,7 +1557,7 @@ static void flying_rc_track_right_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -1638,7 +1638,7 @@ static void flying_rc_track_banked_left_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -2017,7 +2017,7 @@ static void flying_rc_track_left_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -2129,7 +2129,7 @@ static void flying_rc_track_right_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -2241,7 +2241,7 @@ static void flying_rc_track_25_deg_up_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -2353,7 +2353,7 @@ static void flying_rc_track_25_deg_up_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -2497,7 +2497,7 @@ static void flying_rc_track_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -2582,7 +2582,7 @@ static void flying_rc_track_left_quarter_turn_5_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -2926,7 +2926,7 @@ static void flying_rc_track_right_quarter_turn_5_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -3288,7 +3288,7 @@ static void flying_rc_track_s_bend_left( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -3615,7 +3615,7 @@ static void flying_rc_track_s_bend_right( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -3942,7 +3942,7 @@ static void flying_rc_track_left_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -4190,7 +4190,7 @@ static void flying_rc_track_left_quarter_turn_3_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -4444,7 +4444,7 @@ static void flying_rc_track_left_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -4615,7 +4615,7 @@ static void flying_rc_track_right_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -6006,7 +6006,7 @@ static void flying_rc_track_left_quarter_turn_1_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -6089,7 +6089,7 @@ static void flying_rc_track_right_quarter_turn_1_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -6187,7 +6187,7 @@ static void flying_rc_track_brakes( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -6988,7 +6988,7 @@ static void flying_rc_track_25_deg_up_left_banked( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -7094,7 +7094,7 @@ static void flying_rc_track_25_deg_up_right_banked( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -7200,7 +7200,7 @@ static void flying_rc_track_on_ride_photo( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -7319,7 +7319,7 @@ static void flying_rc_track_left_eighth_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -7633,7 +7633,7 @@ static void flying_rc_track_right_eighth_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -7965,7 +7965,7 @@ static void flying_rc_track_left_eighth_bank_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -8280,7 +8280,7 @@ static void flying_rc_track_right_eighth_bank_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -8613,7 +8613,7 @@ static void flying_rc_track_diag_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -8905,7 +8905,7 @@ static void flying_rc_track_diag_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -9197,7 +9197,7 @@ static void flying_rc_track_diag_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -9433,7 +9433,7 @@ static void flying_rc_track_diag_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -9725,7 +9725,7 @@ static void flying_rc_track_diag_25_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -9961,7 +9961,7 @@ static void flying_rc_track_diag_60_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -10197,7 +10197,7 @@ static void flying_rc_track_diag_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -10489,7 +10489,7 @@ static void flying_rc_track_diag_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -10725,7 +10725,7 @@ static void flying_rc_track_diag_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -10961,7 +10961,7 @@ static void flying_rc_track_diag_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -11190,7 +11190,7 @@ static void flying_rc_track_diag_25_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -11426,7 +11426,7 @@ static void flying_rc_track_diag_60_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -11662,7 +11662,7 @@ static void flying_rc_track_diag_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -11898,7 +11898,7 @@ static void flying_rc_track_diag_flat_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -12068,7 +12068,7 @@ static void flying_rc_track_diag_flat_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -12238,7 +12238,7 @@ static void flying_rc_track_diag_left_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -12408,7 +12408,7 @@ static void flying_rc_track_diag_right_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -12578,7 +12578,7 @@ static void flying_rc_track_diag_left_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -12747,7 +12747,7 @@ static void flying_rc_track_diag_right_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -12916,7 +12916,7 @@ static void flying_rc_track_diag_25_deg_up_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -13085,7 +13085,7 @@ static void flying_rc_track_diag_25_deg_up_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -13254,7 +13254,7 @@ static void flying_rc_track_diag_left_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -13416,7 +13416,7 @@ static void flying_rc_track_diag_right_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -13578,7 +13578,7 @@ static void flying_rc_track_diag_25_deg_down_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -13747,7 +13747,7 @@ static void flying_rc_track_diag_25_deg_down_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -13916,7 +13916,7 @@ static void flying_rc_track_diag_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -14083,7 +14083,7 @@ static void flying_rc_track_diag_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -14954,7 +14954,7 @@ static void flying_rc_track_block_brakes( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -15012,7 +15012,7 @@ static void flying_rc_track_left_banked_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -15186,7 +15186,7 @@ static void flying_rc_track_right_banked_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -15386,7 +15386,7 @@ static void flying_rc_track_left_banked_quarter_turn_5_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -15733,7 +15733,7 @@ static void flying_rc_track_right_banked_quarter_turn_5_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -16100,7 +16100,7 @@ static void flying_rc_track_25_deg_up_to_left_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -16208,7 +16208,7 @@ static void flying_rc_track_25_deg_up_to_right_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -16316,7 +16316,7 @@ static void flying_rc_track_left_banked_25_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -16424,7 +16424,7 @@ static void flying_rc_track_right_banked_25_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -16568,7 +16568,7 @@ static void flying_rc_track_left_banked_flat_to_left_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -16674,7 +16674,7 @@ static void flying_rc_track_right_banked_flat_to_right_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -16780,7 +16780,7 @@ static void flying_rc_track_left_banked_25_deg_up_to_left_banked_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -16886,7 +16886,7 @@ static void flying_rc_track_right_banked_25_deg_up_to_right_banked_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -17028,7 +17028,7 @@ static void flying_rc_track_flat_to_left_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -17136,7 +17136,7 @@ static void flying_rc_track_flat_to_right_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -17244,7 +17244,7 @@ static void flying_rc_track_left_banked_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -17352,7 +17352,7 @@ static void flying_rc_track_right_banked_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { diff --git a/src/openrct2/ride/coaster/LayDownRollerCoaster.cpp b/src/openrct2/ride/coaster/LayDownRollerCoaster.cpp index 759c3e699f..8a382e1d8e 100644 --- a/src/openrct2/ride/coaster/LayDownRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/LayDownRollerCoaster.cpp @@ -24,7 +24,7 @@ static void lay_down_rc_track_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { if (tileElement->AsTrack()->HasChain()) { @@ -136,7 +136,7 @@ static void lay_down_rc_track_station( paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (track_element_is_inverted(tileElement)) + if (tileElement->AsTrack()->IsInverted()) { static constexpr const uint32_t imageIds[4][3] = { { SPR_STATION_BASE_C_SW_NE, 26557, SPR_STATION_INVERTED_BAR_A_SW_NE }, @@ -194,7 +194,7 @@ static void lay_down_rc_track_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { if (tileElement->AsTrack()->HasChain()) { @@ -359,7 +359,7 @@ static void lay_down_rc_track_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { if (tileElement->AsTrack()->HasChain()) { @@ -475,7 +475,7 @@ static void lay_down_rc_track_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { if (tileElement->AsTrack()->HasChain()) { @@ -640,7 +640,7 @@ static void lay_down_rc_track_25_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { if (tileElement->AsTrack()->HasChain()) { @@ -770,7 +770,7 @@ static void lay_down_rc_track_60_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { if (tileElement->AsTrack()->HasChain()) { @@ -924,7 +924,7 @@ static void lay_down_rc_track_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { if (tileElement->AsTrack()->HasChain()) { @@ -1137,7 +1137,7 @@ static void lay_down_rc_track_left_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -1515,7 +1515,7 @@ static void lay_down_rc_track_flat_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -1596,7 +1596,7 @@ static void lay_down_rc_track_flat_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -1677,7 +1677,7 @@ static void lay_down_rc_track_left_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -1758,7 +1758,7 @@ static void lay_down_rc_track_right_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -1839,7 +1839,7 @@ static void lay_down_rc_track_banked_left_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -2218,7 +2218,7 @@ static void lay_down_rc_track_left_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -2330,7 +2330,7 @@ static void lay_down_rc_track_right_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -2442,7 +2442,7 @@ static void lay_down_rc_track_25_deg_up_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -2554,7 +2554,7 @@ static void lay_down_rc_track_25_deg_up_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -2698,7 +2698,7 @@ static void lay_down_rc_track_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -2783,7 +2783,7 @@ static void lay_down_rc_track_left_quarter_turn_5_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -3127,7 +3127,7 @@ static void lay_down_rc_track_right_quarter_turn_5_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -3491,7 +3491,7 @@ static void lay_down_rc_track_s_bend_left( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -3818,7 +3818,7 @@ static void lay_down_rc_track_s_bend_right( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -4659,7 +4659,7 @@ static void lay_down_rc_track_left_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -4907,7 +4907,7 @@ static void lay_down_rc_track_left_quarter_turn_3_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -5161,7 +5161,7 @@ static void lay_down_rc_track_left_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -5332,7 +5332,7 @@ static void lay_down_rc_track_right_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -6725,7 +6725,7 @@ static void lay_down_rc_track_left_quarter_turn_1_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -6803,7 +6803,7 @@ static void lay_down_rc_track_right_quarter_turn_1_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -6900,7 +6900,7 @@ static void lay_down_rc_track_brakes( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -6961,7 +6961,7 @@ static void lay_down_rc_track_on_ride_photo( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -7064,7 +7064,7 @@ static void lay_down_rc_track_left_eighth_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -7378,7 +7378,7 @@ static void lay_down_rc_track_right_eighth_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -7710,7 +7710,7 @@ static void lay_down_rc_track_left_eighth_bank_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -8025,7 +8025,7 @@ static void lay_down_rc_track_right_eighth_bank_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -8358,7 +8358,7 @@ static void lay_down_rc_track_diag_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -8650,7 +8650,7 @@ static void lay_down_rc_track_diag_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -8942,7 +8942,7 @@ static void lay_down_rc_track_diag_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -9178,7 +9178,7 @@ static void lay_down_rc_track_diag_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -9470,7 +9470,7 @@ static void lay_down_rc_track_diag_25_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -9706,7 +9706,7 @@ static void lay_down_rc_track_diag_60_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -9942,7 +9942,7 @@ static void lay_down_rc_track_diag_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -10234,7 +10234,7 @@ static void lay_down_rc_track_diag_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -10470,7 +10470,7 @@ static void lay_down_rc_track_diag_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -10706,7 +10706,7 @@ static void lay_down_rc_track_diag_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -10935,7 +10935,7 @@ static void lay_down_rc_track_diag_25_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -11171,7 +11171,7 @@ static void lay_down_rc_track_diag_60_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -11407,7 +11407,7 @@ static void lay_down_rc_track_diag_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -11643,7 +11643,7 @@ static void lay_down_rc_track_diag_flat_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -11813,7 +11813,7 @@ static void lay_down_rc_track_diag_flat_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -11983,7 +11983,7 @@ static void lay_down_rc_track_diag_left_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -12153,7 +12153,7 @@ static void lay_down_rc_track_diag_right_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -12323,7 +12323,7 @@ static void lay_down_rc_track_diag_left_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -12492,7 +12492,7 @@ static void lay_down_rc_track_diag_right_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -12661,7 +12661,7 @@ static void lay_down_rc_track_diag_25_deg_up_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -12830,7 +12830,7 @@ static void lay_down_rc_track_diag_25_deg_up_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -12999,7 +12999,7 @@ static void lay_down_rc_track_diag_left_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -13161,7 +13161,7 @@ static void lay_down_rc_track_diag_right_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -13323,7 +13323,7 @@ static void lay_down_rc_track_diag_25_deg_down_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -13492,7 +13492,7 @@ static void lay_down_rc_track_diag_25_deg_down_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -13661,7 +13661,7 @@ static void lay_down_rc_track_diag_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -13828,7 +13828,7 @@ static void lay_down_rc_track_diag_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -15062,7 +15062,7 @@ static void lay_down_rc_track_block_brakes( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { diff --git a/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp b/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp index e6a001f3f0..c5f0f57fa6 100644 --- a/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp @@ -24,7 +24,7 @@ static void multi_dimension_rc_track_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { if (tileElement->AsTrack()->HasChain()) { @@ -166,7 +166,7 @@ static void multi_dimension_rc_track_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { if (tileElement->AsTrack()->HasChain()) { @@ -301,7 +301,7 @@ static void multi_dimension_rc_track_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -382,7 +382,7 @@ static void multi_dimension_rc_track_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { if (tileElement->AsTrack()->HasChain()) { @@ -517,7 +517,7 @@ static void multi_dimension_rc_track_25_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -608,7 +608,7 @@ static void multi_dimension_rc_track_60_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -723,7 +723,7 @@ static void multi_dimension_rc_track_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { if (tileElement->AsTrack()->HasChain()) { @@ -908,7 +908,7 @@ static void multi_dimension_rc_track_left_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -1284,7 +1284,7 @@ static void multi_dimension_rc_track_flat_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -1364,7 +1364,7 @@ static void multi_dimension_rc_track_flat_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -1444,7 +1444,7 @@ static void multi_dimension_rc_track_left_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -1524,7 +1524,7 @@ static void multi_dimension_rc_track_right_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -1604,7 +1604,7 @@ static void multi_dimension_rc_track_banked_left_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -1982,7 +1982,7 @@ static void multi_dimension_rc_track_left_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -2093,7 +2093,7 @@ static void multi_dimension_rc_track_right_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -2204,7 +2204,7 @@ static void multi_dimension_rc_track_25_deg_up_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -2315,7 +2315,7 @@ static void multi_dimension_rc_track_25_deg_up_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -2462,7 +2462,7 @@ static void multi_dimension_rc_track_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -2546,7 +2546,7 @@ static void multi_dimension_rc_track_s_bend_left( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -2861,7 +2861,7 @@ static void multi_dimension_rc_track_s_bend_right( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -3176,7 +3176,7 @@ static void multi_dimension_rc_track_left_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -3422,7 +3422,7 @@ static void multi_dimension_rc_track_left_quarter_turn_3_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -4847,7 +4847,7 @@ static void multi_dimension_rc_track_brakes( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -4907,7 +4907,7 @@ static void multi_dimension_rc_track_on_ride_photo( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -5010,7 +5010,7 @@ static void multi_dimension_rc_track_90_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -5099,7 +5099,7 @@ static void multi_dimension_rc_track_60_deg_up_to_90_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -5197,7 +5197,7 @@ static void multi_dimension_rc_track_90_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -5278,7 +5278,7 @@ static void multi_dimension_rc_track_60_deg_down_to_90_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -5365,7 +5365,7 @@ static void multi_dimension_rc_track_left_eighth_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -5670,7 +5670,7 @@ static void multi_dimension_rc_track_right_eighth_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -5993,7 +5993,7 @@ static void multi_dimension_rc_track_left_eighth_bank_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -6299,7 +6299,7 @@ static void multi_dimension_rc_track_right_eighth_bank_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -6625,7 +6625,7 @@ static void multi_dimension_rc_track_diag_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -6917,7 +6917,7 @@ static void multi_dimension_rc_track_diag_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -7209,7 +7209,7 @@ static void multi_dimension_rc_track_diag_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -7375,7 +7375,7 @@ static void multi_dimension_rc_track_diag_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -7667,7 +7667,7 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -7833,7 +7833,7 @@ static void multi_dimension_rc_track_diag_60_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -7999,7 +7999,7 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -8291,7 +8291,7 @@ static void multi_dimension_rc_track_diag_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -8527,7 +8527,7 @@ static void multi_dimension_rc_track_diag_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -8693,7 +8693,7 @@ static void multi_dimension_rc_track_diag_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -8925,7 +8925,7 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -9091,7 +9091,7 @@ static void multi_dimension_rc_track_diag_60_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -9257,7 +9257,7 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -9493,7 +9493,7 @@ static void multi_dimension_rc_track_diag_flat_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -9663,7 +9663,7 @@ static void multi_dimension_rc_track_diag_flat_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -9833,7 +9833,7 @@ static void multi_dimension_rc_track_diag_left_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -10003,7 +10003,7 @@ static void multi_dimension_rc_track_diag_right_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -10173,7 +10173,7 @@ static void multi_dimension_rc_track_diag_left_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -10342,7 +10342,7 @@ static void multi_dimension_rc_track_diag_right_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -10511,7 +10511,7 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -10680,7 +10680,7 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -10849,7 +10849,7 @@ static void multi_dimension_rc_track_diag_left_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -11011,7 +11011,7 @@ static void multi_dimension_rc_track_diag_right_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -11173,7 +11173,7 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -11342,7 +11342,7 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -11511,7 +11511,7 @@ static void multi_dimension_rc_track_diag_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -11678,7 +11678,7 @@ static void multi_dimension_rc_track_diag_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -12289,7 +12289,7 @@ static void multi_dimension_rc_track_multidim_inverted_flat_to_90_deg_quarter_lo paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -12488,7 +12488,7 @@ static void multi_dimension_rc_track_block_brakes( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (direction) { @@ -12545,7 +12545,7 @@ static void multi_dimension_rc_track_multidim_90_deg_up_to_inverted_flat_quarter paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -12740,7 +12740,7 @@ static void multi_dimension_rc_track_multidim_flat_to_90_deg_down_quarter_loop( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { @@ -12939,7 +12939,7 @@ static void multi_dimension_rc_track_elem_255( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const rct_tile_element* tileElement) { - if (!track_element_is_inverted(tileElement)) + if (!tileElement->AsTrack()->IsInverted()) { switch (trackSequence) { diff --git a/src/openrct2/world/TileElement.h b/src/openrct2/world/TileElement.h index 86667dbf9f..dfd2acabf9 100644 --- a/src/openrct2/world/TileElement.h +++ b/src/openrct2/world/TileElement.h @@ -274,6 +274,9 @@ public: bool HasCableLift() const; void SetHasCableLift(bool on); + + bool IsInverted() const; + void SetInverted(bool inverted); uint8_t GetSeatRotation() const; void SetSeatRotation(uint8_t newSeatRotation); diff --git a/test/testpaint/Compat.cpp b/test/testpaint/Compat.cpp index ce1cc79d57..5bf513c28f 100644 --- a/test/testpaint/Compat.cpp +++ b/test/testpaint/Compat.cpp @@ -234,23 +234,6 @@ bool track_element_is_lift_hill(const rct_tile_element* trackElement) return trackElement->type & 0x80; } -bool track_element_is_inverted(const rct_tile_element* trackElement) -{ - return trackElement->properties.track.colour & TRACK_ELEMENT_COLOUR_FLAG_INVERTED; -} - -void track_element_set_inverted(rct_tile_element* tileElement, bool inverted) -{ - if (inverted) - { - tileElement->properties.track.colour |= TRACK_ELEMENT_COLOUR_FLAG_INVERTED; - } - else - { - tileElement->properties.track.colour &= ~TRACK_ELEMENT_COLOUR_FLAG_INVERTED; - } -} - bool is_csg_loaded() { return false; diff --git a/test/testpaint/generate.cpp b/test/testpaint/generate.cpp index b92e4c9ee0..19a8c08d7a 100644 --- a/test/testpaint/generate.cpp +++ b/test/testpaint/generate.cpp @@ -148,7 +148,7 @@ private: if (_rideType == RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER || _rideType == RIDE_TYPE_FLYING_ROLLER_COASTER || _rideType == RIDE_TYPE_LAY_DOWN_ROLLER_COASTER) { - WriteLine(1, "if (!track_element_is_inverted(tileElement)) {"); + WriteLine(1, "if (!tileElement->AsTrack()->IsInverted()) {"); _invertedTrack = false; GenerateTrackFunctionBody(2, trackType); WriteLine(1, "} else {"); @@ -450,7 +450,7 @@ private: tileElement.base_height = 3; if (_invertedTrack) { - track_element_set_inverted(&tileElement, true); + tileElement.AsTrack()->SetInverted(true); } g_currently_drawn_item = &tileElement;