mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-17 03:53:07 +01:00
Code Issues Releases Wiki Activity

Fix references on deprecated GAME_COMMAND_DEMOLISH_RIDE

Browse Source
This commit is contained in:
ZehMatt
2017-10-01 08:55:08 +02:00
committed by Michał Janiszewski
parent aba3c270bb
commit d8d7d97f74
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/openrct2/actions/RideDemolishAction.hpp
View File

@@ -196,7 +196,10 @@ public:
res->Position = { x, y, z };
}
window_close_by_number(WC_RIDE_CONSTRUCTION, _rideIndex);
if (!(GetFlags() & GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED))
{
window_close_by_number(WC_RIDE_CONSTRUCTION, _rideIndex);
}
window_close_by_number(WC_RIDE, _rideIndex);
window_close_by_number(WC_DEMOLISH_RIDE_PROMPT, _rideIndex);
window_close_by_class(WC_NEW_CAMPAIGN);

2
src/openrct2/windows/MazeConstruction.cpp
View File

@@ -181,7 +181,7 @@ static void window_maze_construction_close(rct_window *w)
if (ride->overall_view.xy == RCT_XY8_UNDEFINED) {
sint32 savedPausedState = gGamePaused;
gGamePaused = 0;
game_do_command(0, GAME_COMMAND_FLAG_APPLY | GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED, 0, rideIndex, GAME_COMMAND_DEMOLISH_RIDE, 0, 0);
ride_demolish(rideIndex, GAME_COMMAND_FLAG_APPLY | GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED);
gGamePaused = savedPausedState;
} else {
window_ride_main_open(rideIndex);

3
src/openrct2/windows/RideConstruction.cpp
View File

@@ -664,8 +664,7 @@ static void window_ride_construction_close(rct_window *w)
sint32 eax = gGamePaused;
gGamePaused = 0;
game_do_command(0, 9, 0, rideIndex, GAME_COMMAND_DEMOLISH_RIDE, 0, 0);
ride_demolish(rideIndex, GAME_COMMAND_FLAG_APPLY);
gGamePaused = eax;
}
}

2
src/openrct2/windows/RideList.cpp
View File

@@ -436,7 +436,7 @@ static void window_ride_list_scrollmousedown(rct_window *w, sint32 scrollIndex,
uint8 rideIndex = w->list_item_positions[index];
if (_quickDemolishMode && network_get_mode() != NETWORK_MODE_CLIENT) {
gGameCommandErrorTitle = STR_CANT_DEMOLISH_RIDE;
game_do_command(0, GAME_COMMAND_FLAG_APPLY, 0, rideIndex, GAME_COMMAND_DEMOLISH_RIDE, 0, 0);
ride_demolish(rideIndex, GAME_COMMAND_FLAG_APPLY);
window_ride_list_refresh_list(w);
}
else {