From 705fe17362f545b9569b32eb30253c968ab3f690 Mon Sep 17 00:00:00 2001 From: duncanspumpkin Date: Sun, 24 Feb 2019 08:56:40 +0000 Subject: [PATCH] Implement RideEntranceExitRemoveAction Move all calls to the game action framework --- .../actions/GameActionRegistration.cpp | 2 + .../actions/RideEntranceExitRemoveAction.hpp | 155 ++++++++++++++++++ src/openrct2/ride/Ride.cpp | 18 +- src/openrct2/world/Entrance.cpp | 19 ++- 4 files changed, 181 insertions(+), 13 deletions(-) create mode 100644 src/openrct2/actions/RideEntranceExitRemoveAction.hpp diff --git a/src/openrct2/actions/GameActionRegistration.cpp b/src/openrct2/actions/GameActionRegistration.cpp index 0e0f8861de..58bbb829c0 100644 --- a/src/openrct2/actions/GameActionRegistration.cpp +++ b/src/openrct2/actions/GameActionRegistration.cpp @@ -26,6 +26,7 @@ #include "PlacePeepSpawnAction.hpp" #include "RideCreateAction.hpp" #include "RideDemolishAction.hpp" +#include "RideEntranceExitRemoveAction.hpp" #include "RideSetAppearanceAction.hpp" #include "RideSetColourScheme.hpp" #include "RideSetName.hpp" @@ -63,6 +64,7 @@ namespace GameActions Register(); Register(); Register(); + Register(); Register(); Register(); Register(); diff --git a/src/openrct2/actions/RideEntranceExitRemoveAction.hpp b/src/openrct2/actions/RideEntranceExitRemoveAction.hpp new file mode 100644 index 0000000000..e7e15e18fb --- /dev/null +++ b/src/openrct2/actions/RideEntranceExitRemoveAction.hpp @@ -0,0 +1,155 @@ +/***************************************************************************** + * Copyright (c) 2014-2018 OpenRCT2 developers + * + * For a complete list of all authors, please refer to contributors.md + * Interested in contributing? Visit https://github.com/OpenRCT2/OpenRCT2 + * + * OpenRCT2 is licensed under the GNU General Public License version 3. + *****************************************************************************/ + +#pragma once + +#include "../ride/Ride.h" +#include "../ride/Station.h" +#include "../world/Entrance.h" +#include "GameAction.h" + +DEFINE_GAME_ACTION(RideEntranceExitRemoveAction, GAME_COMMAND_REMOVE_RIDE_ENTRANCE_OR_EXIT, GameActionResult) +{ +private: + CoordsXY _loc; + NetworkRideId_t _rideIndex; + uint8_t _stationNum; + bool _isExit; + +public: + RideEntranceExitRemoveAction() = default; + + RideEntranceExitRemoveAction(CoordsXY loc, ride_id_t rideIndex, uint8_t stationNum, bool isExit) + : _loc(loc) + , _rideIndex(rideIndex) + , _stationNum(stationNum) + , _isExit(isExit) + { + } + + uint16_t GetActionFlags() const override + { + return GameAction::GetActionFlags() | GA_FLAGS::ALLOW_WHILE_PAUSED; + } + + void Serialise(DataSerialiser & stream) override + { + GameAction::Serialise(stream); + + stream << DS_TAG(_loc) << DS_TAG(_rideIndex) << DS_TAG(_stationNum) << DS_TAG(_isExit); + } + + GameActionResult::Ptr Query() const override + { + if (_rideIndex >= MAX_RIDES || _rideIndex == RIDE_ID_NULL) + { + log_warning("Invalid game command for ride %u", uint32_t(_rideIndex)); + return std::make_unique(GA_ERROR::INVALID_PARAMETERS, STR_NONE); + } + + Ride* ride = get_ride(_rideIndex); + if (ride == nullptr || ride->type == RIDE_TYPE_NULL) + { + log_warning("Invalid ride id %u for entrance/exit removal", _rideIndex); + return std::make_unique(GA_ERROR::INVALID_PARAMETERS, STR_NONE); + } + + if (ride->status != RIDE_STATUS_CLOSED) + { + gGameCommandErrorText = STR_MUST_BE_CLOSED_FIRST; + return MakeResult(GA_ERROR::INVALID_PARAMETERS, STR_MUST_BE_CLOSED_FIRST); + } + + if (ride->lifecycle_flags & RIDE_LIFECYCLE_INDESTRUCTIBLE_TRACK) + { + return MakeResult(GA_ERROR::INVALID_PARAMETERS, STR_NOT_ALLOWED_TO_MODIFY_STATION); + } + + return MakeResult(); + } + + GameActionResult::Ptr Execute() const override + { + Ride* ride = get_ride(_rideIndex); + if (ride == nullptr || ride->type == RIDE_TYPE_NULL) + { + log_warning("Invalid ride id %u for entrance/exit removal", _rideIndex); + return std::make_unique(GA_ERROR::INVALID_PARAMETERS, STR_NONE); + } + + ride_clear_for_construction(ride); + ride_remove_peeps(ride); + invalidate_test_results(ride); + + bool found = false; + TileElement* tileElement = map_get_first_element_at(_loc.x / 32, _loc.y / 32); + + do + { + if (tileElement == nullptr) + break; + + if (tileElement->GetType() != TILE_ELEMENT_TYPE_ENTRANCE) + continue; + + if (tile_element_get_ride_index(tileElement) != _rideIndex) + continue; + + if (tileElement->AsEntrance()->GetStationIndex() != _stationNum) + continue; + + if ((GetFlags() & GAME_COMMAND_FLAG_5) && !(tileElement->flags & TILE_ELEMENT_FLAG_GHOST)) + continue; + + if (tileElement->AsEntrance()->GetEntranceType() == ENTRANCE_TYPE_PARK_ENTRANCE) + continue; + + if (tileElement->AsEntrance()->GetEntranceType() == ENTRANCE_TYPE_RIDE_ENTRANCE && _isExit) + continue; + + if (tileElement->AsEntrance()->GetEntranceType() == ENTRANCE_TYPE_RIDE_EXIT && !_isExit) + continue; + + found = true; + break; + } while (!(tileElement++)->IsLastForTile()); + + if (!found) + { + log_warning( + "Track Element not found. x = %d, y = %d, ride = %d, station = %d", _loc.x, _loc.y, _rideIndex, _stationNum); + return MakeResult(GA_ERROR::INVALID_PARAMETERS, STR_NONE); + } + + auto res = MakeResult(); + res->Position.x = _loc.x + 16; + res->Position.y = _loc.y + 16; + res->Position.z = tile_element_height(res->Position.x, res->Position.y); + + footpath_queue_chain_reset(); + maze_entrance_hedge_replacement(_loc.x, _loc.y, tileElement); + footpath_remove_edges_at(_loc.x, _loc.y, tileElement); + + tile_element_remove(tileElement); + + if (_isExit) + { + ride_clear_exit_location(ride, _stationNum); + } + else + { + ride_clear_entrance_location(ride, _stationNum); + } + + footpath_update_queue_chains(); + + map_invalidate_tile_full(_loc.x, _loc.y); + return res; + } +}; diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index 3a072856b9..11fa40fe6a 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -9,6 +9,7 @@ #include "Ride.h" +#include "../actions/RideEntranceExitRemoveAction.hpp" #include "../Cheats.h" #include "../Context.h" #include "../Editor.h" @@ -1917,12 +1918,17 @@ static int32_t ride_modify_entrance_or_exit(TileElement* tileElement, int32_t x, else { // Remove entrance / exit - game_do_command( - x, (GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED | GAME_COMMAND_FLAG_APPLY), y, rideIndex, - GAME_COMMAND_REMOVE_RIDE_ENTRANCE_OR_EXIT, stationIndex, entranceType == ENTRANCE_TYPE_RIDE_EXIT); - gCurrentToolWidget.widget_index = entranceType == ENTRANCE_TYPE_RIDE_ENTRANCE ? WC_RIDE_CONSTRUCTION__WIDX_ENTRANCE - : WC_RIDE_CONSTRUCTION__WIDX_EXIT; - gRideEntranceExitPlaceType = entranceType; + auto rideEntranceExitRemove = RideEntranceExitRemoveAction( + { x, y }, rideIndex, stationIndex, entranceType == ENTRANCE_TYPE_RIDE_EXIT); + + rideEntranceExitRemove.SetCallback([=](const GameAction* ga, const GameActionResult* result) { + gCurrentToolWidget.widget_index = entranceType == ENTRANCE_TYPE_RIDE_ENTRANCE ? WC_RIDE_CONSTRUCTION__WIDX_ENTRANCE + : WC_RIDE_CONSTRUCTION__WIDX_EXIT; + gRideEntranceExitPlaceType = entranceType; + window_invalidate_by_class(WC_RIDE_CONSTRUCTION); + }); + + GameActions::Execute(&rideEntranceExitRemove); } window_invalidate_by_class(WC_RIDE_CONSTRUCTION); diff --git a/src/openrct2/world/Entrance.cpp b/src/openrct2/world/Entrance.cpp index 2a676239fe..13a2d78111 100644 --- a/src/openrct2/world/Entrance.cpp +++ b/src/openrct2/world/Entrance.cpp @@ -12,6 +12,7 @@ #include "../Cheats.h" #include "../Game.h" #include "../OpenRCT2.h" +#include "../actions/RideEntranceExitRemoveAction.hpp" #include "../localisation/StringIds.h" #include "../management/Finance.h" #include "../network/network.h" @@ -209,10 +210,13 @@ static money32 RideEntranceExitPlace( if (requiresRemove) { - money32 success = game_do_command( - removeCoord.x, flags, removeCoord.y, rideIndex, GAME_COMMAND_REMOVE_RIDE_ENTRANCE_OR_EXIT, stationNum, isExit); + auto rideEntranceExitRemove = RideEntranceExitRemoveAction( + { removeCoord.x, removeCoord.y }, rideIndex, stationNum, isExit); + rideEntranceExitRemove.SetFlags(flags); - if (success == MONEY32_UNDEFINED) + auto res = flags & GAME_COMMAND_FLAG_APPLY ? GameActions::ExecuteNested(&rideEntranceExitRemove) + : GameActions::QueryNested(&rideEntranceExitRemove); + if (res->Error != GA_ERROR::OK) { return MONEY32_UNDEFINED; } @@ -488,11 +492,12 @@ void ride_entrance_exit_remove_ghost() { if (_currentTrackSelectionFlags & TRACK_SELECTION_FLAG_ENTRANCE_OR_EXIT) { - game_do_command( - gRideEntranceExitGhostPosition.x, - (GAME_COMMAND_FLAG_5 | GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED | GAME_COMMAND_FLAG_APPLY), - gRideEntranceExitGhostPosition.y, _currentRideIndex, GAME_COMMAND_REMOVE_RIDE_ENTRANCE_OR_EXIT, + auto rideEntranceExitRemove = RideEntranceExitRemoveAction( + { gRideEntranceExitGhostPosition.x, gRideEntranceExitGhostPosition.y }, _currentRideIndex, gRideEntranceExitGhostStationIndex, gRideEntranceExitPlaceType == ENTRANCE_TYPE_RIDE_EXIT); + + rideEntranceExitRemove.SetFlags(GAME_COMMAND_FLAG_5); + GameActions::Execute(&rideEntranceExitRemove); } }