From 09c8e4755ff36cfd3923f04699ba263705fac13e Mon Sep 17 00:00:00 2001 From: spacek531 Date: Sat, 31 Dec 2022 05:06:22 -0800 Subject: [PATCH] Rename GetBrakeClosed() to IsBrakeClosed() --- data/language/en-GB.txt | 1 + src/openrct2-ui/windows/TileInspector.cpp | 21 +++++++++++-------- src/openrct2/actions/TileModifyAction.cpp | 6 +++--- src/openrct2/actions/TileModifyAction.h | 2 +- src/openrct2/localisation/StringIds.h | 2 ++ src/openrct2/rct12/RCT12.h | 2 +- src/openrct2/rct2/S6Importer.cpp | 2 +- src/openrct2/ride/Ride.cpp | 11 +++++++--- src/openrct2/ride/Station.cpp | 2 +- src/openrct2/ride/Track.cpp | 10 ++++----- src/openrct2/ride/Track.h | 2 +- src/openrct2/ride/Vehicle.cpp | 11 +++++----- .../ride/coaster/BobsleighCoaster.cpp | 2 +- .../ride/coaster/BolligerMabillardTrack.hpp | 4 ++-- .../ride/coaster/CorkscrewRollerCoaster.cpp | 4 ++-- src/openrct2/ride/coaster/GigaCoaster.cpp | 4 ++-- .../ride/coaster/JuniorRollerCoaster.cpp | 4 ++-- .../ride/coaster/LimLaunchedRollerCoaster.cpp | 4 ++-- .../ride/coaster/MineTrainCoaster.cpp | 4 ++-- .../ride/coaster/MiniRollerCoaster.cpp | 4 ++-- .../coaster/MultiDimensionRollerCoaster.cpp | 4 ++-- .../ride/coaster/StandUpRollerCoaster.cpp | 4 ++-- src/openrct2/ride/coaster/WildMouse.cpp | 4 ++-- .../ride/coaster/WoodenRollerCoaster.cpp | 8 +++---- src/openrct2/world/TileElement.h | 4 ++-- src/openrct2/world/TileInspector.cpp | 4 ++-- src/openrct2/world/TileInspector.h | 2 +- 27 files changed, 72 insertions(+), 60 deletions(-) diff --git a/data/language/en-GB.txt b/data/language/en-GB.txt index b44db1bb52..c9b4aefc20 100644 --- a/data/language/en-GB.txt +++ b/data/language/en-GB.txt @@ -3641,6 +3641,7 @@ STR_6535 :{WINDOW_COLOUR_2}Nausea Factor: {BLACK}-{COMMA16}% STR_6536 :This park was saved in a later version of OpenRCT2. The park was saved in v{INT32}, you are currently on v{INT32}. STR_6537 :Allow using regular paths as queue STR_6538 :Shows regular paths in the queues dropdown of the Footpaths window. +STR_6539 :Brake Closed ############# # Scenarios # diff --git a/src/openrct2-ui/windows/TileInspector.cpp b/src/openrct2-ui/windows/TileInspector.cpp index a88a612163..104cdb1542 100644 --- a/src/openrct2-ui/windows/TileInspector.cpp +++ b/src/openrct2-ui/windows/TileInspector.cpp @@ -121,7 +121,7 @@ enum WindowTileInspectorWidgetIdx WIDX_TRACK_SPINNER_HEIGHT_INCREASE, WIDX_TRACK_SPINNER_HEIGHT_DECREASE, WIDX_TRACK_CHECK_CHAIN_LIFT, - WIDX_TRACK_CHECK_BLOCK_BRAKE_CLOSED, + WIDX_TRACK_CHECK_BRAKE_CLOSED, WIDX_TRACK_CHECK_IS_INDESTRUCTIBLE, // Scenery @@ -316,7 +316,7 @@ static rct_widget TrackWidgets[] = { MakeWidget(PropertyRowCol({ 12, 0}, 0, 0), PropertyFullWidth, WindowWidgetType::Checkbox, WindowColour::Secondary, STR_TILE_INSPECTOR_TRACK_ENTIRE_TRACK_PIECE), // WIDX_TRACK_CHECK_APPLY_TO_ALL MakeSpinnerWidgets(PropertyRowCol({ 12, 0 }, 1, 1), PropertyButtonSize, WindowWidgetType::Spinner, WindowColour::Secondary), // WIDX_TRACK_SPINNER_HEIGHT{,_INCREASE,_DECREASE} MakeWidget(PropertyRowCol({ 12, 0}, 2, 0), PropertyFullWidth, WindowWidgetType::Checkbox, WindowColour::Secondary, STR_TILE_INSPECTOR_TRACK_CHAIN_LIFT), // WIDX_TRACK_CHECK_CHAIN_LIFT - MakeWidget(PropertyRowCol({ 12, 0}, 3, 0), PropertyFullWidth, WindowWidgetType::Checkbox, WindowColour::Secondary, STR_TILE_INSPECTOR_TRACK_BLOCK_BRAKE), // WIDX_TRACK_CHECK_BLOCK_BRAKE_CLOSED + MakeWidget(PropertyRowCol({ 12, 0}, 3, 0), PropertyFullWidth, WindowWidgetType::Checkbox, WindowColour::Secondary, STR_TILE_INSPECTOR_TRACK_BRAKE_CLOSED), // WIDX_TRACK_CHECK_BRAKE_CLOSED MakeWidget(PropertyRowCol({ 12, 0}, 4, 0), PropertyFullWidth, WindowWidgetType::Checkbox, WindowColour::Secondary, STR_TILE_INSPECTOR_TRACK_IS_INDESTRUCTIBLE), // WIDX_TRACK_CHECK_IS_INDESTRUCTIBLE WIDGETS_END, }; @@ -644,8 +644,8 @@ public: break; } - case WIDX_TRACK_CHECK_BLOCK_BRAKE_CLOSED: - TrackSetBlockBrake(windowTileInspectorSelectedIndex, !tileElement->AsTrack()->BlockBrakeClosed()); + case WIDX_TRACK_CHECK_BRAKE_CLOSED: + TrackSetBrakeClosed(windowTileInspectorSelectedIndex, !tileElement->AsTrack()->IsBrakeClosed()); break; case WIDX_TRACK_CHECK_IS_INDESTRUCTIBLE: @@ -1916,9 +1916,9 @@ private: GameActions::Execute(&modifyTile); } - void TrackSetBlockBrake(int32_t elementIndex, bool blockBrake) + void TrackSetBrakeClosed(int32_t elementIndex, bool isClosed) { - auto modifyTile = TileModifyAction(_toolMap, TileModifyType::TrackSetBlockBrake, elementIndex, blockBrake); + auto modifyTile = TileModifyAction(_toolMap, TileModifyType::TrackSetBrake, elementIndex, isClosed); GameActions::Execute(&modifyTile); } @@ -2176,13 +2176,16 @@ private: widgets[WIDX_TRACK_SPINNER_HEIGHT_DECREASE].bottom = GBBB(propertiesAnchor, 1) - 4; widgets[WIDX_TRACK_CHECK_CHAIN_LIFT].top = GBBT(propertiesAnchor, 2); widgets[WIDX_TRACK_CHECK_CHAIN_LIFT].bottom = GBBB(propertiesAnchor, 2); - widgets[WIDX_TRACK_CHECK_BLOCK_BRAKE_CLOSED].top = GBBT(propertiesAnchor, 3); - widgets[WIDX_TRACK_CHECK_BLOCK_BRAKE_CLOSED].bottom = GBBB(propertiesAnchor, 3); + widgets[WIDX_TRACK_CHECK_BRAKE_CLOSED].top = GBBT(propertiesAnchor, 3); + widgets[WIDX_TRACK_CHECK_BRAKE_CLOSED].bottom = GBBB(propertiesAnchor, 3); widgets[WIDX_TRACK_CHECK_IS_INDESTRUCTIBLE].top = GBBT(propertiesAnchor, 4); widgets[WIDX_TRACK_CHECK_IS_INDESTRUCTIBLE].bottom = GBBB(propertiesAnchor, 4); SetCheckboxValue(WIDX_TRACK_CHECK_APPLY_TO_ALL, _applyToAll); SetCheckboxValue(WIDX_TRACK_CHECK_CHAIN_LIFT, tileElement->AsTrack()->HasChain()); - SetCheckboxValue(WIDX_TRACK_CHECK_BLOCK_BRAKE_CLOSED, tileElement->AsTrack()->BlockBrakeClosed()); + SetCheckboxValue(WIDX_TRACK_CHECK_BRAKE_CLOSED, tileElement->AsTrack()->IsBrakeClosed()); + widgets[WIDX_TRACK_CHECK_BRAKE_CLOSED].content = tileElement->AsTrack()->IsBlockStart() + ? STR_TILE_INSPECTOR_TRACK_BLOCK_BRAKE + : STR_TILE_INSPECTOR_TRACK_BRAKE_CLOSED; SetCheckboxValue(WIDX_TRACK_CHECK_IS_INDESTRUCTIBLE, tileElement->AsTrack()->IsIndestructible()); break; diff --git a/src/openrct2/actions/TileModifyAction.cpp b/src/openrct2/actions/TileModifyAction.cpp index 58c41dc9be..1d14b30ae1 100644 --- a/src/openrct2/actions/TileModifyAction.cpp +++ b/src/openrct2/actions/TileModifyAction.cpp @@ -183,11 +183,11 @@ GameActions::Result TileModifyAction::QueryExecute(bool isExecuting) const res = TileInspector::TrackSetChain(_loc, elementIndex, false, setChain, isExecuting); break; } - case TileModifyType::TrackSetBlockBrake: + case TileModifyType::TrackSetBrake: { const auto elementIndex = _value1; - const bool blockBrake = _value2; - res = TileInspector::TrackSetBlockBrake(_loc, elementIndex, blockBrake, isExecuting); + const bool isClosed = _value2; + res = TileInspector::TrackSetBrakeClosed(_loc, elementIndex, isClosed, isExecuting); break; } case TileModifyType::TrackSetIndestructible: diff --git a/src/openrct2/actions/TileModifyAction.h b/src/openrct2/actions/TileModifyAction.h index 0b326dad68..40c498894c 100644 --- a/src/openrct2/actions/TileModifyAction.h +++ b/src/openrct2/actions/TileModifyAction.h @@ -32,7 +32,7 @@ enum class TileModifyType : uint8_t TrackBaseHeightOffset, TrackSetChain, TrackSetChainBlock, - TrackSetBlockBrake, + TrackSetBrake, TrackSetIndestructible, ScenerySetQuarterLocation, ScenerySetQuarterCollision, diff --git a/src/openrct2/localisation/StringIds.h b/src/openrct2/localisation/StringIds.h index d3a5107a67..b3b0f4c74f 100644 --- a/src/openrct2/localisation/StringIds.h +++ b/src/openrct2/localisation/StringIds.h @@ -3931,6 +3931,8 @@ enum : uint16_t STR_CHEAT_ALLOW_PATH_AS_QUEUE = 6537, STR_CHEAT_ALLOW_PATH_AS_QUEUE_TIP = 6538, + STR_TILE_INSPECTOR_TRACK_BRAKE_CLOSED = 6539, + // Have to include resource strings (from scenarios and objects) for the time being now that language is partially working /* MAX_STR_COUNT = 32768 */ // MAX_STR_COUNT - upper limit for number of strings, not the current count strings }; diff --git a/src/openrct2/rct12/RCT12.h b/src/openrct2/rct12/RCT12.h index ad68b6c38d..3a27defe5a 100644 --- a/src/openrct2/rct12/RCT12.h +++ b/src/openrct2/rct12/RCT12.h @@ -466,7 +466,7 @@ private: struct { // The lower 4 bits are the track sequence. - // The upper 4 bits are either station bits or on-ride photo bits. + // The upper 4 bits are either station bits, brake speed bits, or on-ride photo bits. // // Station bits: // - Bit 8 marks green light diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index 4b4689e8bf..103ff98367 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -1414,7 +1414,7 @@ namespace RCT2 dst2->SetInverted(src2->IsInverted()); dst2->SetStationIndex(StationIndex::FromUnderlying(src2->GetStationIndex())); dst2->SetHasGreenLight(src2->HasGreenLight()); - dst2->SetBlockBrakeClosed(src2->BlockBrakeClosed()); + dst2->SetBrakeClosed(src2->BlockBrakeClosed()); dst2->SetIsIndestructible(src2->IsIndestructible()); // Skipping IsHighlighted() diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index ffcdee2dbb..a1d933c21e 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -3033,7 +3033,7 @@ static void RideOpenBlockBrakes(const CoordsXYE& startElement) case TrackElemType::DiagUp25ToFlat: case TrackElemType::DiagUp60ToFlat: case TrackElemType::BlockBrakes: - currentElement.element->AsTrack()->SetBlockBrakeClosed(false); + currentElement.element->AsTrack()->SetBrakeClosed(false); break; } } while (track_block_get_next(¤tElement, ¤tElement, nullptr, nullptr) @@ -3559,6 +3559,10 @@ void Ride::MoveTrainsToBlockBrakes(TrackElement* firstBlock) if (train == nullptr) continue; + // At this point, all vehicles have state of MovingToEndOfStation, which slowly moves forward at a constant speed + // regardless of incline. The first vehicle stops at the station immediately, while all other vehicles seek forward + // until they reach a closed block brake. The block brake directly before the station is set to closed every frame + // because the trains will open the block brake when the tail leaves the station. train->UpdateTrackMotion(nullptr); if (i == 0) @@ -3577,7 +3581,7 @@ void Ride::MoveTrainsToBlockBrakes(TrackElement* firstBlock) break; } - firstBlock->SetBlockBrakeClosed(true); + firstBlock->SetBrakeClosed(true); for (Vehicle* car = train; car != nullptr; car = GetEntity(car->next_vehicle_on_train)) { car->velocity = 0; @@ -3587,7 +3591,8 @@ void Ride::MoveTrainsToBlockBrakes(TrackElement* firstBlock) } } while (!(train->UpdateTrackMotion(nullptr) & VEHICLE_UPDATE_MOTION_TRACK_FLAG_VEHICLE_AT_BLOCK_BRAKE)); - firstBlock->SetBlockBrakeClosed(true); + // All vehicles are in position, set the block brake directly before the station one last time + firstBlock->SetBrakeClosed(true); for (Vehicle* car = train; car != nullptr; car = GetEntity(car->next_vehicle_on_train)) { car->ClearUpdateFlag(VEHICLE_UPDATE_FLAG_COLLISION_DISABLED); diff --git a/src/openrct2/ride/Station.cpp b/src/openrct2/ride/Station.cpp index db893963f2..51e32faa7e 100644 --- a/src/openrct2/ride/Station.cpp +++ b/src/openrct2/ride/Station.cpp @@ -61,7 +61,7 @@ static void ride_update_station_blocksection(Ride* ride, StationIndex stationInd auto& station = ride->GetStation(stationIndex); if ((ride->status == RideStatus::Closed && ride->num_riders == 0) - || (tileElement != nullptr && tileElement->AsTrack()->BlockBrakeClosed())) + || (tileElement != nullptr && tileElement->AsTrack()->IsBrakeClosed())) { station.Depart &= ~STATION_DEPART_FLAG; diff --git a/src/openrct2/ride/Track.cpp b/src/openrct2/ride/Track.cpp index 9269b56855..14e22bbd44 100644 --- a/src/openrct2/ride/Track.cpp +++ b/src/openrct2/ride/Track.cpp @@ -852,20 +852,20 @@ void TrackElement::SetInverted(bool inverted) } } -bool TrackElement::BlockBrakeClosed() const +bool TrackElement::IsBrakeClosed() const { - return (Flags2 & TRACK_ELEMENT_FLAGS2_BLOCK_BRAKE_CLOSED) != 0; + return (Flags2 & TRACK_ELEMENT_FLAGS2_BRAKE_CLOSED) != 0; } -void TrackElement::SetBlockBrakeClosed(bool isClosed) +void TrackElement::SetBrakeClosed(bool isClosed) { if (isClosed) { - Flags2 |= TRACK_ELEMENT_FLAGS2_BLOCK_BRAKE_CLOSED; + Flags2 |= TRACK_ELEMENT_FLAGS2_BRAKE_CLOSED; } else { - Flags2 &= ~TRACK_ELEMENT_FLAGS2_BLOCK_BRAKE_CLOSED; + Flags2 &= ~TRACK_ELEMENT_FLAGS2_BRAKE_CLOSED; } } diff --git a/src/openrct2/ride/Track.h b/src/openrct2/ride/Track.h index c9b98449ae..41b371fa85 100644 --- a/src/openrct2/ride/Track.h +++ b/src/openrct2/ride/Track.h @@ -94,7 +94,7 @@ enum TRACK_ELEMENT_FLAGS2_CABLE_LIFT = 1 << 2, TRACK_ELEMENT_FLAGS2_HIGHLIGHT = 1 << 3, TRACK_ELEMENT_FLAGS2_HAS_GREEN_LIGHT = 1 << 4, - TRACK_ELEMENT_FLAGS2_BLOCK_BRAKE_CLOSED = 1 << 5, + TRACK_ELEMENT_FLAGS2_BRAKE_CLOSED = 1 << 5, TRACK_ELEMENT_FLAGS2_INDESTRUCTIBLE_TRACK_PIECE = 1 << 6, }; diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp index fbf224bd18..e5aecd45ed 100644 --- a/src/openrct2/ride/Vehicle.cpp +++ b/src/openrct2/ride/Vehicle.cpp @@ -6128,14 +6128,14 @@ void Vehicle::CheckAndApplyBlockSectionStopSite() switch (trackType) { case TrackElemType::BlockBrakes: - if (curRide->IsBlockSectioned() && trackElement->AsTrack()->BlockBrakeClosed()) + if (curRide->IsBlockSectioned() && trackElement->AsTrack()->IsBrakeClosed()) ApplyStopBlockBrake(); else ApplyNonStopBlockBrake(); break; case TrackElemType::EndStation: - if (trackElement->AsTrack()->BlockBrakeClosed()) + if (trackElement->AsTrack()->IsBrakeClosed()) _vehicleMotionTrackFlags |= VEHICLE_UPDATE_MOTION_TRACK_FLAG_VEHICLE_AT_BLOCK_BRAKE; break; @@ -6148,7 +6148,7 @@ void Vehicle::CheckAndApplyBlockSectionStopSite() { if (trackType == TrackElemType::CableLiftHill || trackElement->AsTrack()->HasChain()) { - if (trackElement->AsTrack()->BlockBrakeClosed()) + if (trackElement->AsTrack()->IsBrakeClosed()) { ApplyStopBlockBrake(); } @@ -6236,7 +6236,7 @@ static void block_brakes_open_previous_section(Ride& ride, const CoordsXYZ& vehi { return; } - trackElement->SetBlockBrakeClosed(false); + trackElement->SetBrakeClosed(false); MapInvalidateElement(location, reinterpret_cast(trackElement)); auto trackType = trackElement->GetTrackType(); @@ -7411,7 +7411,8 @@ bool Vehicle::UpdateTrackMotionForwardsGetNewTrack(uint16_t trackType, Ride* cur { if (next_vehicle_on_train.IsNull()) { - tileElement->AsTrack()->SetBlockBrakeClosed(true); + tileElement->AsTrack()->SetBrakeClosed(true); + if (trackType == TrackElemType::BlockBrakes || trackType == TrackElemType::EndStation) { if (!(rideEntry->Cars[0].flags & CAR_ENTRY_FLAG_POWERED)) diff --git a/src/openrct2/ride/coaster/BobsleighCoaster.cpp b/src/openrct2/ride/coaster/BobsleighCoaster.cpp index 902f22f5eb..9893889b2a 100644 --- a/src/openrct2/ride/coaster/BobsleighCoaster.cpp +++ b/src/openrct2/ride/coaster/BobsleighCoaster.cpp @@ -3772,7 +3772,7 @@ static void bobsleigh_rc_track_block_brakes( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - bool isClosed = trackElement.BlockBrakeClosed(); + bool isClosed = trackElement.IsBrakeClosed(); switch (direction) { case 0: diff --git a/src/openrct2/ride/coaster/BolligerMabillardTrack.hpp b/src/openrct2/ride/coaster/BolligerMabillardTrack.hpp index deea224fa9..4060250519 100644 --- a/src/openrct2/ride/coaster/BolligerMabillardTrack.hpp +++ b/src/openrct2/ride/coaster/BolligerMabillardTrack.hpp @@ -92,7 +92,7 @@ static void bolliger_mabillard_track_station( if (trackElement.GetTrackType() == TrackElemType::EndStation) { - bool isClosed = trackElement.BlockBrakeClosed(); + bool isClosed = trackElement.IsBrakeClosed(); PaintAddImageAsParentRotated( session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(_BolligerMabillardBlockBrakeImages[direction][isClosed]), @@ -9221,7 +9221,7 @@ static void bolliger_mabillard_track_block_brakes( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - bool isClosed = trackElement.BlockBrakeClosed(); + bool isClosed = trackElement.IsBrakeClosed(); switch (direction) { case 0: diff --git a/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp b/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp index f9e020ca5d..31df8ae9c9 100644 --- a/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp @@ -107,7 +107,7 @@ static void corkscrew_rc_track_station( if (trackElement.GetTrackType() == TrackElemType::EndStation) { - bool isClosed = trackElement.BlockBrakeClosed(); + bool isClosed = trackElement.IsBrakeClosed(); PaintAddImageAsParentRotated( session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(_CorkscrewRCBlockBrakeImages[direction][isClosed]), { 0, 0, height }, { 32, 20, 1 }, { 0, 6, height + 3 }); @@ -8901,7 +8901,7 @@ static void corkscrew_rc_track_block_brakes( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - bool isClosed = trackElement.BlockBrakeClosed(); + bool isClosed = trackElement.IsBrakeClosed(); PaintAddImageAsParentRotated( session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(_CorkscrewRCBlockBrakeImages[direction][isClosed]), { 0, 0, height }, { 32, 20, 3 }, { 0, 6, height }); diff --git a/src/openrct2/ride/coaster/GigaCoaster.cpp b/src/openrct2/ride/coaster/GigaCoaster.cpp index 9a87815fdc..8b8820efbe 100644 --- a/src/openrct2/ride/coaster/GigaCoaster.cpp +++ b/src/openrct2/ride/coaster/GigaCoaster.cpp @@ -137,7 +137,7 @@ static void giga_rc_track_station( if (trackElement.GetTrackType() == TrackElemType::EndStation) { - bool isClosed = trackElement.BlockBrakeClosed(); + bool isClosed = trackElement.IsBrakeClosed(); PaintAddImageAsParentRotated( session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(_GigaCoasterBrakeImages[direction][isClosed][0]), { 0, 0, height }, { 32, 20, 1 }, { 0, 6, height + 3 }); @@ -8100,7 +8100,7 @@ static void giga_rc_track_block_brakes( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - bool isClosed = trackElement.BlockBrakeClosed(); + bool isClosed = trackElement.IsBrakeClosed(); PaintAddImageAsParentRotated( session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(_GigaCoasterBrakeImages[direction][isClosed][0]), { 0, 0, height }, { 32, 20, 3 }, { 0, 6, height }); diff --git a/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp b/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp index 8a53f3d90a..acd4fa6f98 100644 --- a/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp @@ -1838,7 +1838,7 @@ void junior_rc_paint_station( { ImageId imageId; - bool isBraked = trackElement.BlockBrakeClosed(); + bool isBraked = trackElement.IsBrakeClosed(); if (direction == 0 || direction == 2) { @@ -3877,7 +3877,7 @@ static void junior_rc_block_brake_paint_setup( { ImageId image_id; - bool isBraked = trackElement.BlockBrakeClosed(); + bool isBraked = trackElement.IsBrakeClosed(); image_id = session.TrackColours[SCHEME_TRACK].WithIndex(junior_rc_track_pieces_block_brake[isBraked][direction]); if (direction & 1) diff --git a/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp b/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp index 1c5cac1729..95e4337df8 100644 --- a/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp @@ -44,7 +44,7 @@ static void lim_launched_rc_track_station( if (trackElement.GetTrackType() == TrackElemType::EndStation) { - bool isClosed = trackElement.BlockBrakeClosed(); + bool isClosed = trackElement.IsBrakeClosed(); PaintAddImageAsParentRotated( session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(_LimLauncherBlockBrakeImages[direction][isClosed]), { 0, 0, height }, { 32, 20, 1 }, { 0, 6, height + 3 }); @@ -1748,7 +1748,7 @@ static void lim_launched_rc_track_block_brakes( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - bool isClosed = trackElement.BlockBrakeClosed(); + bool isClosed = trackElement.IsBrakeClosed(); PaintAddImageAsParentRotated( session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(_LimLauncherBlockBrakeImages[direction][isClosed]), { 0, 0, height }, { 32, 20, 3 }, { 0, 6, height }); diff --git a/src/openrct2/ride/coaster/MineTrainCoaster.cpp b/src/openrct2/ride/coaster/MineTrainCoaster.cpp index 5ffa691120..18e8be76d0 100644 --- a/src/openrct2/ride/coaster/MineTrainCoaster.cpp +++ b/src/openrct2/ride/coaster/MineTrainCoaster.cpp @@ -107,7 +107,7 @@ static void mine_train_rc_track_station( { 32, 28, 1 }, { 0, 2, height }); if (trackElement.GetTrackType() == TrackElemType::EndStation) { - bool isClosed = trackElement.BlockBrakeClosed(); + bool isClosed = trackElement.IsBrakeClosed(); PaintAddImageAsChildRotated( session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(_MineTrainBlockBrakeImages[direction][isClosed]), { 0, 0, height }, { 32, 20, 1 }, { 0, 0, height }); @@ -7505,7 +7505,7 @@ static void mine_train_rc_track_block_brakes( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - bool isClosed = trackElement.BlockBrakeClosed(); + bool isClosed = trackElement.IsBrakeClosed(); PaintAddImageAsParentRotated( session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(_MineTrainBlockBrakeImages[direction][isClosed]), { 0, 0, height }, { 32, 20, 1 }, { 0, 6, height }); diff --git a/src/openrct2/ride/coaster/MiniRollerCoaster.cpp b/src/openrct2/ride/coaster/MiniRollerCoaster.cpp index 5916f61868..f1332d9a79 100644 --- a/src/openrct2/ride/coaster/MiniRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/MiniRollerCoaster.cpp @@ -125,7 +125,7 @@ static void mini_rc_track_station( if (trackElement.GetTrackType() == TrackElemType::EndStation) { - bool isClosed = trackElement.BlockBrakeClosed(); + bool isClosed = trackElement.IsBrakeClosed(); PaintAddImageAsParentRotated( session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(_MiniRCBlockBrakeImages[direction][isClosed]), { 0, 0, height }, { 32, 20, 1 }, { 0, 6, height + 3 }); @@ -7704,7 +7704,7 @@ static void mini_rc_track_block_brakes( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - bool isClosed = trackElement.BlockBrakeClosed(); + bool isClosed = trackElement.IsBrakeClosed(); PaintAddImageAsParentRotated( session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(_MiniRCBlockBrakeImages[direction][isClosed]), { 0, 0, height }, { 32, 20, 3 }, { 0, 6, height }); diff --git a/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp b/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp index 65d0835a0a..9f16b2f8f1 100644 --- a/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp @@ -135,7 +135,7 @@ static void multi_dimension_rc_track_station( if (trackElement.GetTrackType() == TrackElemType::EndStation) { - bool isClosed = trackElement.BlockBrakeClosed(); + bool isClosed = trackElement.IsBrakeClosed(); uint8_t offset = isClosed ? 2 : 1; PaintAddImageAsParentRotated( session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][offset]), { 0, 0, height }, @@ -12442,7 +12442,7 @@ static void multi_dimension_rc_track_block_brakes( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - bool isClosed = trackElement.BlockBrakeClosed(); + bool isClosed = trackElement.IsBrakeClosed(); if (!trackElement.IsInverted()) { diff --git a/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp b/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp index 0803f363bf..334c47b976 100644 --- a/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp @@ -101,7 +101,7 @@ static void stand_up_rc_track_station( if (trackElement.GetTrackType() == TrackElemType::EndStation) { - bool isClosed = trackElement.BlockBrakeClosed(); + bool isClosed = trackElement.IsBrakeClosed(); PaintAddImageAsParentRotated( session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(_StandUpBlockBrakeImages[direction][isClosed]), { 0, 6, height }, { 32, 20, 1 }, { 0, 6, height + 3 }); @@ -8754,7 +8754,7 @@ static void stand_up_rc_track_block_brakes( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - bool isClosed = trackElement.BlockBrakeClosed(); + bool isClosed = trackElement.IsBrakeClosed(); PaintAddImageAsParentRotated( session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(_StandUpBlockBrakeImages[direction][isClosed]), { 0, 6, height }, { 32, 20, 3 }); diff --git a/src/openrct2/ride/coaster/WildMouse.cpp b/src/openrct2/ride/coaster/WildMouse.cpp index 063d2ebd97..b504017617 100644 --- a/src/openrct2/ride/coaster/WildMouse.cpp +++ b/src/openrct2/ride/coaster/WildMouse.cpp @@ -205,7 +205,7 @@ static void wild_mouse_track_station( { 32, 28, 2 }, { 0, 2, height }); if (trackType == TrackElemType::EndStation) { - bool isClosed = trackElement.BlockBrakeClosed(); + bool isClosed = trackElement.IsBrakeClosed(); PaintAddImageAsChildRotated( session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(_wild_mouse_block_brakes_image_ids[direction][isClosed]), @@ -921,7 +921,7 @@ static void wild_mouse_track_block_brakes( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - bool isClosed = trackElement.BlockBrakeClosed(); + bool isClosed = trackElement.IsBrakeClosed(); auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(_wild_mouse_block_brakes_image_ids[direction][isClosed]); PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 20, 3 }, { 0, 6, height }); if (track_paint_util_should_paint_supports(session.MapPosition)) diff --git a/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp b/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp index d3bc1a553d..73e99e9249 100644 --- a/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp @@ -497,8 +497,8 @@ static void wooden_rc_track_station( int32_t trackType = trackElement.GetTrackType(); if (trackType == TrackElemType::EndStation) { - const auto brakeImg = trackElement.BlockBrakeClosed() ? _wooden_rc_station_block_brakes_image_ids[direction][1] - : _wooden_rc_station_block_brakes_image_ids[direction][0]; + const auto brakeImg = trackElement.IsBrakeClosed() ? _wooden_rc_station_block_brakes_image_ids[direction][1] + : _wooden_rc_station_block_brakes_image_ids[direction][0]; wooden_rc_track_paint(session, brakeImg, SPR_G2_EMPTY, direction, 0, 2, 32, 27, 2, height, 0, 2, height); } else @@ -12833,8 +12833,8 @@ static void wooden_rc_track_block_brakes( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - const auto brakeImg = trackElement.BlockBrakeClosed() ? _wooden_rc_block_brakes_image_ids[direction][1] - : _wooden_rc_block_brakes_image_ids[direction][0]; + const auto brakeImg = trackElement.IsBrakeClosed() ? _wooden_rc_block_brakes_image_ids[direction][1] + : _wooden_rc_block_brakes_image_ids[direction][0]; wooden_rc_track_paint( session, brakeImg, _wooden_rc_block_brakes_image_ids[direction][2], direction, 0, 2, 32, 25, 2, height, 0, 3, height); WoodenASupportsPaintSetup(session, direction & 1, 0, height, session.TrackColours[SCHEME_SUPPORTS]); diff --git a/src/openrct2/world/TileElement.h b/src/openrct2/world/TileElement.h index b4e73e66ef..f99cc363db 100644 --- a/src/openrct2/world/TileElement.h +++ b/src/openrct2/world/TileElement.h @@ -382,8 +382,8 @@ public: bool IsInverted() const; void SetInverted(bool inverted); - bool BlockBrakeClosed() const; - void SetBlockBrakeClosed(bool isClosed); + bool IsBrakeClosed() const; + void SetBrakeClosed(bool isClosed); bool IsIndestructible() const; void SetIsIndestructible(bool isIndestructible); diff --git a/src/openrct2/world/TileInspector.cpp b/src/openrct2/world/TileInspector.cpp index 7184a78308..2d2360ddaa 100644 --- a/src/openrct2/world/TileInspector.cpp +++ b/src/openrct2/world/TileInspector.cpp @@ -916,7 +916,7 @@ namespace OpenRCT2::TileInspector return GameActions::Result(); } - GameActions::Result TrackSetBlockBrake(const CoordsXY& loc, int32_t elementIndex, bool blockBrake, bool isExecuting) + GameActions::Result TrackSetBrakeClosed(const CoordsXY& loc, int32_t elementIndex, bool isClosed, bool isExecuting) { TileElement* const trackElement = MapGetNthElementAt(loc, elementIndex); if (trackElement == nullptr || trackElement->GetType() != TileElementType::Track) @@ -924,7 +924,7 @@ namespace OpenRCT2::TileInspector if (isExecuting) { - trackElement->AsTrack()->SetBlockBrakeClosed(blockBrake); + trackElement->AsTrack()->SetBrakeClosed(isClosed); MapInvalidateTileFull(loc); diff --git a/src/openrct2/world/TileInspector.h b/src/openrct2/world/TileInspector.h index 5a0d0cba34..abd7b9b39f 100644 --- a/src/openrct2/world/TileInspector.h +++ b/src/openrct2/world/TileInspector.h @@ -41,7 +41,7 @@ namespace OpenRCT2::TileInspector GameActions::Result WallAnimationFrameOffset( const CoordsXY& loc, int16_t elementIndex, int8_t animationFrameOffset, bool isExecuting); GameActions::Result TrackBaseHeightOffset(const CoordsXY& loc, int32_t elementIndex, int8_t offset, bool isExecuting); - GameActions::Result TrackSetBlockBrake(const CoordsXY& loc, int32_t elementIndex, bool blockBrake, bool isExecuting); + GameActions::Result TrackSetBrakeClosed(const CoordsXY& loc, int32_t elementIndex, bool isClosed, bool isExecuting); GameActions::Result TrackSetIndestructible( const CoordsXY& loc, int32_t elementIndex, bool isIndestructible, bool isExecuting); GameActions::Result TrackSetChain(