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

Fix issue #15211: Rename RideConstructionState::Build to ...::MazeBuild (#15212) 

Pull #15203 commited enum RideConstructionState missing the "Maze" part in "MazeBuild"
This commit is contained in:
Kane 2021-08-13 01:43:34 +10:00 committed by GitHub
parent 8f5ec43486
commit cf9bb4cd2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/openrct2-ui/windows/MazeConstruction.cpp
View File

@ -274,7 +274,7 @@ static void window_maze_construction_mousedown(rct_window* w, rct_widgetindex wi
switch (widgetIndex) switch (widgetIndex)
{ {
case WIDX_MAZE_BUILD_MODE: case WIDX_MAZE_BUILD_MODE:
window_maze_construction_build_mode_mousedown(RideConstructionState::Build); window_maze_construction_build_mode_mousedown(RideConstructionState::MazeBuild);
break; break;
case WIDX_MAZE_MOVE_MODE: case WIDX_MAZE_MOVE_MODE:
window_maze_construction_build_mode_mousedown(RideConstructionState::MazeMove); window_maze_construction_build_mode_mousedown(RideConstructionState::MazeMove);
@ -484,7 +484,7 @@ void window_maze_construction_update_pressed_widgets()
pressedWidgets |= EnumToFlag(WIDX_MAZE_EXIT); pressedWidgets |= EnumToFlag(WIDX_MAZE_EXIT);
} }
break; break;
case RideConstructionState::Build: case RideConstructionState::MazeBuild:
pressedWidgets |= EnumToFlag(WIDX_MAZE_BUILD_MODE); pressedWidgets |= EnumToFlag(WIDX_MAZE_BUILD_MODE);
break; break;
case RideConstructionState::MazeMove: case RideConstructionState::MazeMove:
@ -519,7 +519,7 @@ static void window_maze_construction_construct(int32_t direction)
z = _currentTrackBegin.z; z = _currentTrackBegin.z;
switch (_rideConstructionState) switch (_rideConstructionState)
{ {
case RideConstructionState::Build: case RideConstructionState::MazeBuild:
mode = GC_SET_MAZE_TRACK_BUILD; mode = GC_SET_MAZE_TRACK_BUILD;
flags = GAME_COMMAND_FLAG_APPLY; flags = GAME_COMMAND_FLAG_APPLY;
break; break;

4
src/openrct2-ui/windows/RideConstruction.cpp
View File

@ -2610,7 +2610,7 @@ void sub_6C94D8()
} }
break; break;
} }
case RideConstructionState::Build: case RideConstructionState::MazeBuild:
case RideConstructionState::MazeMove: case RideConstructionState::MazeMove:
case RideConstructionState::MazeFill: case RideConstructionState::MazeFill:
{ {
@ -3735,7 +3735,7 @@ void ride_construction_tooldown_construct(const ScreenCoordsXY& screenCoords)
{ {
for (int32_t zAttempts = 0; zAttempts < numAttempts; ++zAttempts) for (int32_t zAttempts = 0; zAttempts < numAttempts; ++zAttempts)
{ {
_rideConstructionState = RideConstructionState::Build; _rideConstructionState = RideConstructionState::MazeBuild;
_currentTrackBegin.x = mapCoords.x; _currentTrackBegin.x = mapCoords.x;
_currentTrackBegin.y = mapCoords.y; _currentTrackBegin.y = mapCoords.y;
_currentTrackBegin.z = z; _currentTrackBegin.z = z;

2
src/openrct2/ride/Ride.h
View File

@ -889,7 +889,7 @@ enum class RideConstructionState : uint8_t
Selected, Selected,
Place, Place,
EntranceExit, EntranceExit,
Build, MazeBuild,
MazeMove, MazeMove,
MazeFill MazeFill
}; };

4
src/openrct2/ride/RideConstruction.cpp
View File

@ -550,7 +550,7 @@ void ride_construction_invalidate_current_track()
{ _currentTrackBegin, static_cast<Direction>(_currentTrackPieceDirection & 3) }, _currentTrackPieceType, 0, { _currentTrackBegin, static_cast<Direction>(_currentTrackPieceDirection & 3) }, _currentTrackPieceType, 0,
nullptr, TRACK_ELEMENT_SET_HIGHLIGHT_FALSE); nullptr, TRACK_ELEMENT_SET_HIGHLIGHT_FALSE);
break; break;
case RideConstructionState::Build: case RideConstructionState::MazeBuild:
case RideConstructionState::MazeMove: case RideConstructionState::MazeMove:
case RideConstructionState::MazeFill: case RideConstructionState::MazeFill:
case RideConstructionState::Front: case RideConstructionState::Front:
@ -950,7 +950,7 @@ static bool ride_modify_maze(const CoordsXYE& tileElement)
if (trackElement != nullptr) if (trackElement != nullptr)
{ {
_currentRideIndex = trackElement->GetRideIndex(); _currentRideIndex = trackElement->GetRideIndex();
_rideConstructionState = RideConstructionState::Build; _rideConstructionState = RideConstructionState::MazeBuild;
_currentTrackBegin.x = tileElement.x; _currentTrackBegin.x = tileElement.x;
_currentTrackBegin.y = tileElement.y; _currentTrackBegin.y = tileElement.y;
_currentTrackBegin.z = trackElement->GetBaseZ(); _currentTrackBegin.z = trackElement->GetBaseZ();