From 5d82760cf0d3c1ea6fe8b8ce9fd43e7ef4d1a583 Mon Sep 17 00:00:00 2001 From: duncanspumpkin Date: Wed, 27 Feb 2019 18:35:55 +0000 Subject: [PATCH] Use more sensible flags --- src/openrct2/actions/RideEntranceExitRemoveAction.hpp | 4 ++-- src/openrct2/world/Entrance.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/openrct2/actions/RideEntranceExitRemoveAction.hpp b/src/openrct2/actions/RideEntranceExitRemoveAction.hpp index 94392d4fc6..7e8d10fa0f 100644 --- a/src/openrct2/actions/RideEntranceExitRemoveAction.hpp +++ b/src/openrct2/actions/RideEntranceExitRemoveAction.hpp @@ -87,7 +87,7 @@ public: if (tileElement->AsEntrance()->GetStationIndex() != _stationNum) continue; - if ((GetFlags() & GAME_COMMAND_FLAG_5) && !(tileElement->flags & TILE_ELEMENT_FLAG_GHOST)) + if ((GetFlags() & GAME_COMMAND_FLAG_GHOST) && !(tileElement->IsGhost())) continue; if (tileElement->AsEntrance()->GetEntranceType() == ENTRANCE_TYPE_PARK_ENTRANCE) @@ -143,7 +143,7 @@ public: if (tileElement->AsEntrance()->GetStationIndex() != _stationNum) continue; - if ((GetFlags() & GAME_COMMAND_FLAG_5) && !tileElement->IsGhost()) + if ((GetFlags() & GAME_COMMAND_FLAG_GHOST) && !tileElement->IsGhost()) continue; if (tileElement->AsEntrance()->GetEntranceType() == ENTRANCE_TYPE_PARK_ENTRANCE) diff --git a/src/openrct2/world/Entrance.cpp b/src/openrct2/world/Entrance.cpp index d9d49581eb..1422c26c5d 100644 --- a/src/openrct2/world/Entrance.cpp +++ b/src/openrct2/world/Entrance.cpp @@ -384,7 +384,7 @@ void ride_entrance_exit_remove_ghost() { gRideEntranceExitGhostPosition.x, gRideEntranceExitGhostPosition.y }, _currentRideIndex, gRideEntranceExitGhostStationIndex, gRideEntranceExitPlaceType == ENTRANCE_TYPE_RIDE_EXIT); - rideEntranceExitRemove.SetFlags(GAME_COMMAND_FLAG_5); + rideEntranceExitRemove.SetFlags(GAME_COMMAND_FLAG_GHOST | GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED); GameActions::Execute(&rideEntranceExitRemove); } }