From c5805eaae6185252a1d530e141e86793a7cad3d7 Mon Sep 17 00:00:00 2001 From: Stephan Spengler Date: Thu, 5 Jan 2023 10:39:15 +0100 Subject: [PATCH 1/4] Rename FootpathPlaceFromTrack to FootpathLayoutPlace (#19028) --- distribution/changelog.txt | 3 ++- src/openrct2-ui/windows/Map.cpp | 10 +++++----- src/openrct2/actions/GameActionRegistry.cpp | 8 ++++---- ...nceAction.cpp => ParkEntrancePlaceAction.cpp} | 16 ++++++++-------- ...ntranceAction.h => ParkEntrancePlaceAction.h} | 6 +++--- ...pSpawnAction.cpp => PeepSpawnPlaceAction.cpp} | 14 +++++++------- ...ePeepSpawnAction.h => PeepSpawnPlaceAction.h} | 6 +++--- src/openrct2/libopenrct2.vcxproj | 8 ++++---- 8 files changed, 36 insertions(+), 35 deletions(-) rename src/openrct2/actions/{PlaceParkEntranceAction.cpp => ParkEntrancePlaceAction.cpp} (93%) rename src/openrct2/actions/{PlaceParkEntranceAction.h => ParkEntrancePlaceAction.h} (84%) rename src/openrct2/actions/{PlacePeepSpawnAction.cpp => PeepSpawnPlaceAction.cpp} (91%) rename src/openrct2/actions/{PlacePeepSpawnAction.h => PeepSpawnPlaceAction.h} (83%) diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 93f5c14485..2093162821 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -4,10 +4,11 @@ - Feature: [#18732] [Plugin] API to get the guests thoughts. - Feature: [#18744] Cheat to allow using a regular path as a queue path. - Feature: [#19023] Add Canadian French translation. -- Improved: [#18749] Ability to have 4 active awards for more than one month in a row. +- Improved: [#18749] Ability to have 4 active awards for more than one month in a row. - Improved: [#18826] [Plugin] Added all actions and their documentation to plugin API. - Improved: [#18945] Languages can now fall back to other languages than English. - Improved: [#18970] Trying to load a non-park save will now display a context error. +- Improved: [#19018] Renamed park entrance and peep spawn place actions to fit the naming scheme. - Improved: [#19044] Added special thanks to RMC and Wiegand to the About page. - Fix: [#18467] “Selected only” Object Selection filter is active in Track Designs Manager, and cannot be toggled. - Fix: [#18905] Ride Construction window theme is not applied correctly. diff --git a/src/openrct2-ui/windows/Map.cpp b/src/openrct2-ui/windows/Map.cpp index 4155b44add..fe0a41178d 100644 --- a/src/openrct2-ui/windows/Map.cpp +++ b/src/openrct2-ui/windows/Map.cpp @@ -19,8 +19,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include @@ -516,7 +516,7 @@ public: ParkEntranceRemoveGhost(); - auto gameAction = PlaceParkEntranceAction(parkEntrancePosition, gFootpathSelectedId); + auto gameAction = ParkEntrancePlaceAction(parkEntrancePosition, gFootpathSelectedId); gameAction.SetFlags(GAME_COMMAND_FLAG_GHOST); auto result = GameActions::Execute(&gameAction); @@ -534,7 +534,7 @@ public: CoordsXYZD parkEntrancePosition = PlaceParkEntranceGetMapPosition(screenCoords); if (!parkEntrancePosition.IsNull()) { - auto gameAction = PlaceParkEntranceAction(parkEntrancePosition, gFootpathSelectedId); + auto gameAction = ParkEntrancePlaceAction(parkEntrancePosition, gFootpathSelectedId); auto result = GameActions::Execute(&gameAction); if (result.Error == GameActions::Status::Ok) { @@ -584,7 +584,7 @@ public: int32_t mapZ = tileElement->GetBaseZ(); - auto gameAction = PlacePeepSpawnAction({ mapCoords, mapZ, static_cast(direction) }); + auto gameAction = PeepSpawnPlaceAction({ mapCoords, mapZ, static_cast(direction) }); auto result = GameActions::Execute(&gameAction); if (result.Error == GameActions::Status::Ok) { diff --git a/src/openrct2/actions/GameActionRegistry.cpp b/src/openrct2/actions/GameActionRegistry.cpp index 1fbb4f5d3d..f6339a589e 100644 --- a/src/openrct2/actions/GameActionRegistry.cpp +++ b/src/openrct2/actions/GameActionRegistry.cpp @@ -38,6 +38,7 @@ #include "MazePlaceTrackAction.h" #include "MazeSetTrackAction.h" #include "NetworkModifyGroupAction.h" +#include "ParkEntrancePlaceAction.h" #include "ParkEntranceRemoveAction.h" #include "ParkMarketingAction.h" #include "ParkSetDateAction.h" @@ -47,8 +48,7 @@ #include "ParkSetResearchFundingAction.h" #include "PauseToggleAction.h" #include "PeepPickupAction.h" -#include "PlaceParkEntranceAction.h" -#include "PlacePeepSpawnAction.h" +#include "PeepSpawnPlaceAction.h" #include "PlayerKickAction.h" #include "PlayerSetGroupAction.h" #include "RideCreateAction.h" @@ -148,8 +148,8 @@ namespace GameActions REGISTER_ACTION(ParkSetParameterAction); REGISTER_ACTION(ParkSetResearchFundingAction); REGISTER_ACTION(PeepPickupAction); - REGISTER_ACTION(PlaceParkEntranceAction); - REGISTER_ACTION(PlacePeepSpawnAction); + REGISTER_ACTION(ParkEntrancePlaceAction); + REGISTER_ACTION(PeepSpawnPlaceAction); REGISTER_ACTION(PlayerKickAction); REGISTER_ACTION(PlayerSetGroupAction); REGISTER_ACTION(RideCreateAction); diff --git a/src/openrct2/actions/PlaceParkEntranceAction.cpp b/src/openrct2/actions/ParkEntrancePlaceAction.cpp similarity index 93% rename from src/openrct2/actions/PlaceParkEntranceAction.cpp rename to src/openrct2/actions/ParkEntrancePlaceAction.cpp index 341f0a5a28..2a488f13bb 100644 --- a/src/openrct2/actions/PlaceParkEntranceAction.cpp +++ b/src/openrct2/actions/ParkEntrancePlaceAction.cpp @@ -7,7 +7,7 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "PlaceParkEntranceAction.h" +#include "ParkEntrancePlaceAction.h" #include "../Cheats.h" #include "../OpenRCT2.h" @@ -21,24 +21,24 @@ #include "../world/Park.h" #include "../world/Surface.h" -PlaceParkEntranceAction::PlaceParkEntranceAction(const CoordsXYZD& location, ObjectEntryIndex pathType) +ParkEntrancePlaceAction::ParkEntrancePlaceAction(const CoordsXYZD& location, ObjectEntryIndex pathType) : _loc(location) , _pathType(pathType) { } -void PlaceParkEntranceAction::AcceptParameters(GameActionParameterVisitor& visitor) +void ParkEntrancePlaceAction::AcceptParameters(GameActionParameterVisitor& visitor) { visitor.Visit(_loc); visitor.Visit("footpathSurfaceObject", _pathType); } -uint16_t PlaceParkEntranceAction::GetActionFlags() const +uint16_t ParkEntrancePlaceAction::GetActionFlags() const { return GameActionBase::GetActionFlags() | GameActions::Flags::EditorOnly; } -void PlaceParkEntranceAction::Serialise(DataSerialiser& stream) +void ParkEntrancePlaceAction::Serialise(DataSerialiser& stream) { GameAction::Serialise(stream); @@ -46,7 +46,7 @@ void PlaceParkEntranceAction::Serialise(DataSerialiser& stream) stream << DS_TAG(_pathType); } -GameActions::Result PlaceParkEntranceAction::Query() const +GameActions::Result ParkEntrancePlaceAction::Query() const { if (!(gScreenFlags & SCREEN_FLAGS_EDITOR) && !gCheatsSandboxMode) { @@ -109,7 +109,7 @@ GameActions::Result PlaceParkEntranceAction::Query() const return res; } -GameActions::Result PlaceParkEntranceAction::Execute() const +GameActions::Result ParkEntrancePlaceAction::Execute() const { auto res = GameActions::Result(); res.Expenditure = ExpenditureType::LandPurchase; @@ -183,7 +183,7 @@ GameActions::Result PlaceParkEntranceAction::Execute() const return res; } -bool PlaceParkEntranceAction::CheckMapCapacity(int16_t numTiles) const +bool ParkEntrancePlaceAction::CheckMapCapacity(int16_t numTiles) const { CoordsXYZ entranceLoc = _loc; for (uint8_t index = 0; index < 3; index++) diff --git a/src/openrct2/actions/PlaceParkEntranceAction.h b/src/openrct2/actions/ParkEntrancePlaceAction.h similarity index 84% rename from src/openrct2/actions/PlaceParkEntranceAction.h rename to src/openrct2/actions/ParkEntrancePlaceAction.h index e0053b2305..9e055bda47 100644 --- a/src/openrct2/actions/PlaceParkEntranceAction.h +++ b/src/openrct2/actions/ParkEntrancePlaceAction.h @@ -11,15 +11,15 @@ #include "GameAction.h" -class PlaceParkEntranceAction final : public GameActionBase +class ParkEntrancePlaceAction final : public GameActionBase { private: CoordsXYZD _loc; ObjectEntryIndex _pathType; public: - PlaceParkEntranceAction() = default; - PlaceParkEntranceAction(const CoordsXYZD& location, ObjectEntryIndex pathType); + ParkEntrancePlaceAction() = default; + ParkEntrancePlaceAction(const CoordsXYZD& location, ObjectEntryIndex pathType); void AcceptParameters(GameActionParameterVisitor& visitor) override; diff --git a/src/openrct2/actions/PlacePeepSpawnAction.cpp b/src/openrct2/actions/PeepSpawnPlaceAction.cpp similarity index 91% rename from src/openrct2/actions/PlacePeepSpawnAction.cpp rename to src/openrct2/actions/PeepSpawnPlaceAction.cpp index c5d2181859..061bdadaa8 100644 --- a/src/openrct2/actions/PlacePeepSpawnAction.cpp +++ b/src/openrct2/actions/PeepSpawnPlaceAction.cpp @@ -7,7 +7,7 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "PlacePeepSpawnAction.h" +#include "PeepSpawnPlaceAction.h" #include "../Cheats.h" #include "../OpenRCT2.h" @@ -18,29 +18,29 @@ #include "../world/Park.h" #include "../world/Surface.h" -PlacePeepSpawnAction::PlacePeepSpawnAction(const CoordsXYZD& location) +PeepSpawnPlaceAction::PeepSpawnPlaceAction(const CoordsXYZD& location) : _location(location) { } -void PlacePeepSpawnAction::AcceptParameters(GameActionParameterVisitor& visitor) +void PeepSpawnPlaceAction::AcceptParameters(GameActionParameterVisitor& visitor) { visitor.Visit(_location); } -uint16_t PlacePeepSpawnAction::GetActionFlags() const +uint16_t PeepSpawnPlaceAction::GetActionFlags() const { return GameActionBase::GetActionFlags() | GameActions::Flags::EditorOnly | GameActions::Flags::AllowWhilePaused; } -void PlacePeepSpawnAction::Serialise(DataSerialiser& stream) +void PeepSpawnPlaceAction::Serialise(DataSerialiser& stream) { GameAction::Serialise(stream); stream << DS_TAG(_location.x) << DS_TAG(_location.y) << DS_TAG(_location.z) << DS_TAG(_location.direction); } -GameActions::Result PlacePeepSpawnAction::Query() const +GameActions::Result PeepSpawnPlaceAction::Query() const { if (!(gScreenFlags & SCREEN_FLAGS_EDITOR) && !gCheatsSandboxMode) { @@ -83,7 +83,7 @@ GameActions::Result PlacePeepSpawnAction::Query() const return res; } -GameActions::Result PlacePeepSpawnAction::Execute() const +GameActions::Result PeepSpawnPlaceAction::Execute() const { auto res = GameActions::Result(); res.Expenditure = ExpenditureType::LandPurchase; diff --git a/src/openrct2/actions/PlacePeepSpawnAction.h b/src/openrct2/actions/PeepSpawnPlaceAction.h similarity index 83% rename from src/openrct2/actions/PlacePeepSpawnAction.h rename to src/openrct2/actions/PeepSpawnPlaceAction.h index 1592adac30..3bbd6b6aae 100644 --- a/src/openrct2/actions/PlacePeepSpawnAction.h +++ b/src/openrct2/actions/PeepSpawnPlaceAction.h @@ -11,14 +11,14 @@ #include "GameAction.h" -class PlacePeepSpawnAction final : public GameActionBase +class PeepSpawnPlaceAction final : public GameActionBase { private: CoordsXYZD _location; public: - PlacePeepSpawnAction() = default; - PlacePeepSpawnAction(const CoordsXYZD& location); + PeepSpawnPlaceAction() = default; + PeepSpawnPlaceAction(const CoordsXYZD& location); void AcceptParameters(GameActionParameterVisitor& visitor) override; diff --git a/src/openrct2/libopenrct2.vcxproj b/src/openrct2/libopenrct2.vcxproj index f6b6fd532d..0ad14e0ac4 100644 --- a/src/openrct2/libopenrct2.vcxproj +++ b/src/openrct2/libopenrct2.vcxproj @@ -93,6 +93,7 @@ + @@ -102,8 +103,7 @@ - - + @@ -603,8 +603,8 @@ - - + + From 32dd535044fef745a9eca1cdb843973715dc38c1 Mon Sep 17 00:00:00 2001 From: Stephan Spengler Date: Mon, 2 Jan 2023 13:52:38 +0100 Subject: [PATCH 2/4] Rename MapChangeSizeAction to fit naming pattern --- distribution/changelog.txt | 2 +- distribution/openrct2.d.ts | 12 ++++++------ src/openrct2-ui/windows/Map.cpp | 10 +++++----- src/openrct2/Game.h | 2 +- src/openrct2/actions/GameActionRegistry.cpp | 4 ++-- ...geMapSizeAction.cpp => MapChangeSizeAction.cpp} | 14 +++++++------- ...ChangeMapSizeAction.h => MapChangeSizeAction.h} | 6 +++--- src/openrct2/libopenrct2.vcxproj | 4 ++-- src/openrct2/network/NetworkAction.cpp | 2 +- src/openrct2/scripting/ScriptEngine.cpp | 2 +- 10 files changed, 29 insertions(+), 29 deletions(-) rename src/openrct2/actions/{ChangeMapSizeAction.cpp => MapChangeSizeAction.cpp} (84%) rename src/openrct2/actions/{ChangeMapSizeAction.h => MapChangeSizeAction.h} (82%) diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 2093162821..df1879550e 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -8,7 +8,7 @@ - Improved: [#18826] [Plugin] Added all actions and their documentation to plugin API. - Improved: [#18945] Languages can now fall back to other languages than English. - Improved: [#18970] Trying to load a non-park save will now display a context error. -- Improved: [#19018] Renamed park entrance and peep spawn place actions to fit the naming scheme. +- Improved: [#19018] Renamed actions to fit the naming scheme. - Improved: [#19044] Added special thanks to RMC and Wiegand to the About page. - Fix: [#18467] “Selected only” Object Selection filter is active in Track Designs Manager, and cannot be toggled. - Fix: [#18905] Ride Construction window theme is not applied correctly. diff --git a/distribution/openrct2.d.ts b/distribution/openrct2.d.ts index e1ccbd7fb6..784912f123 100644 --- a/distribution/openrct2.d.ts +++ b/distribution/openrct2.d.ts @@ -285,7 +285,6 @@ declare global { queryAction(action: "bannersetcolour", args: BannerSetColourArgs, callback?: (result: GameActionResult) => void): void; queryAction(action: "bannersetname", args: BannerSetNameArgs, callback?: (result: GameActionResult) => void): void; queryAction(action: "bannersetstyle", args: BannerSetStyleArgs, callback?: (result: GameActionResult) => void): void; - queryAction(action: "changemapsize", args: ChangeMapSizeArgs, callback?: (result: GameActionResult) => void): void; queryAction(action: "clearscenery", args: ClearSceneryArgs, callback?: (result: GameActionResult) => void): void; queryAction(action: "climateset", args: ClimateSetArgs, callback?: (result: GameActionResult) => void): void; queryAction(action: "footpathadditionplace", args: FootpathAdditionPlaceArgs, callback?: (result: GameActionResult) => void): void; @@ -305,6 +304,7 @@ declare global { queryAction(action: "largesceneryremove", args: LargeSceneryRemoveArgs, callback?: (result: GameActionResult) => void): void; queryAction(action: "largescenerysetcolour", args: LargeScenerySetColourArgs, callback?: (result: GameActionResult) => void): void; queryAction(action: "loadorquit", args: LoadOrQuitArgs, callback?: (result: GameActionResult) => void): void; + queryAction(action: "mapchangesize", args: MapChangeSizeArgs, callback?: (result: GameActionResult) => void): void; queryAction(action: "mazeplacetrack", args: MazePlaceTrackArgs, callback?: (result: GameActionResult) => void): void; queryAction(action: "mazesettrack", args: MazeSetTrackArgs, callback?: (result: GameActionResult) => void): void; queryAction(action: "networkmodifygroup", args: NetworkModifyGroupArgs, callback?: (result: GameActionResult) => void): void; @@ -729,11 +729,6 @@ declare global { parameter: number; // primary colour | secondary colour | 0: disable, 1: enable } - interface ChangeMapSizeArgs extends GameActionArgs { - targetSizeX: number; - targetSizeY: number; - } - interface ClearSceneryArgs extends GameActionArgs { itemsToClear: number; // Bit mask. 1: small scenery and walls, 2: large scenery, 4: footpaths. } @@ -891,6 +886,11 @@ declare global { savePromptMode: number; // 0: save before load, 1: save before quit. Only used if mode = 0 (open save prompt). } + interface MapChangeSizeArgs extends GameActionArgs { + targetSizeX: number; + targetSizeY: number; + } + interface MazePlaceTrackArgs extends GameActionArgs { x: number; y: number; diff --git a/src/openrct2-ui/windows/Map.cpp b/src/openrct2-ui/windows/Map.cpp index fe0a41178d..69d519e2e3 100644 --- a/src/openrct2-ui/windows/Map.cpp +++ b/src/openrct2-ui/windows/Map.cpp @@ -17,8 +17,8 @@ #include #include #include -#include #include +#include #include #include #include @@ -630,8 +630,8 @@ public: if (_resizeDirection != ResizeDirection::Y) newMapSize.x = size; - auto changeMapSizeAction = ChangeMapSizeAction(newMapSize); - GameActions::Execute(&changeMapSizeAction); + auto mapChangeSizeAction = MapChangeSizeAction(newMapSize); + GameActions::Execute(&mapChangeSizeAction); Invalidate(); } break; @@ -978,7 +978,7 @@ private: if (IsWidgetPressed(WIDX_MAP_SIZE_LINK) || _resizeDirection == ResizeDirection::X) newMapSize.x++; - auto increaseMapSizeAction = ChangeMapSizeAction(newMapSize); + auto increaseMapSizeAction = MapChangeSizeAction(newMapSize); GameActions::Execute(&increaseMapSizeAction); } @@ -990,7 +990,7 @@ private: if (IsWidgetPressed(WIDX_MAP_SIZE_LINK) || _resizeDirection == ResizeDirection::X) newMapSize.x--; - auto decreaseMapSizeAction = ChangeMapSizeAction(newMapSize); + auto decreaseMapSizeAction = MapChangeSizeAction(newMapSize); GameActions::Execute(&decreaseMapSizeAction); } diff --git a/src/openrct2/Game.h b/src/openrct2/Game.h index 71ff2d20ad..1122899753 100644 --- a/src/openrct2/Game.h +++ b/src/openrct2/Game.h @@ -101,7 +101,7 @@ enum class GameCommand : int32_t GuestSetFlags, // GA SetDate, // GA Custom, // GA - ChangeMapSize, + MapChangeSize, FreezeRideRating, Count, }; diff --git a/src/openrct2/actions/GameActionRegistry.cpp b/src/openrct2/actions/GameActionRegistry.cpp index f6339a589e..930b0f5420 100644 --- a/src/openrct2/actions/GameActionRegistry.cpp +++ b/src/openrct2/actions/GameActionRegistry.cpp @@ -13,7 +13,6 @@ #include "BannerSetColourAction.h" #include "BannerSetNameAction.h" #include "BannerSetStyleAction.h" -#include "ChangeMapSizeAction.h" #include "ClearAction.h" #include "ClimateSetAction.h" #include "CustomAction.h" @@ -35,6 +34,7 @@ #include "LargeSceneryRemoveAction.h" #include "LargeScenerySetColourAction.h" #include "LoadOrQuitAction.h" +#include "MapChangeSizeAction.h" #include "MazePlaceTrackAction.h" #include "MazeSetTrackAction.h" #include "NetworkModifyGroupAction.h" @@ -205,7 +205,7 @@ namespace GameActions REGISTER_ACTION(GuestSetFlagsAction); REGISTER_ACTION(ParkSetDateAction); REGISTER_ACTION(SetCheatAction); - REGISTER_ACTION(ChangeMapSizeAction); + REGISTER_ACTION(MapChangeSizeAction); #ifdef ENABLE_SCRIPTING REGISTER_ACTION(CustomAction); #endif diff --git a/src/openrct2/actions/ChangeMapSizeAction.cpp b/src/openrct2/actions/MapChangeSizeAction.cpp similarity index 84% rename from src/openrct2/actions/ChangeMapSizeAction.cpp rename to src/openrct2/actions/MapChangeSizeAction.cpp index 9a11405cb0..b639e8af21 100644 --- a/src/openrct2/actions/ChangeMapSizeAction.cpp +++ b/src/openrct2/actions/MapChangeSizeAction.cpp @@ -7,7 +7,7 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "ChangeMapSizeAction.h" +#include "MapChangeSizeAction.h" #include "../Context.h" #include "../drawing/IDrawingEngine.h" @@ -16,23 +16,23 @@ #include "../windows/Intent.h" #include "../world/Park.h" -ChangeMapSizeAction::ChangeMapSizeAction(const TileCoordsXY& targetSize) +MapChangeSizeAction::MapChangeSizeAction(const TileCoordsXY& targetSize) : _targetSize(targetSize) { } -uint16_t ChangeMapSizeAction::GetActionFlags() const +uint16_t MapChangeSizeAction::GetActionFlags() const { return GameAction::GetActionFlags() | GameActions::Flags::AllowWhilePaused; } -void ChangeMapSizeAction::Serialise(DataSerialiser& stream) +void MapChangeSizeAction::Serialise(DataSerialiser& stream) { GameAction::Serialise(stream); stream << DS_TAG(_targetSize); } -GameActions::Result ChangeMapSizeAction::Query() const +GameActions::Result MapChangeSizeAction::Query() const { if (_targetSize.x > MAXIMUM_MAP_SIZE_TECHNICAL || _targetSize.y > MAXIMUM_MAP_SIZE_TECHNICAL) { @@ -45,7 +45,7 @@ GameActions::Result ChangeMapSizeAction::Query() const return GameActions::Result(); } -GameActions::Result ChangeMapSizeAction::Execute() const +GameActions::Result MapChangeSizeAction::Execute() const { // Expand map while (_targetSize.x > gMapSize.x) @@ -76,7 +76,7 @@ GameActions::Result ChangeMapSizeAction::Execute() const return GameActions::Result(); } -void ChangeMapSizeAction::AcceptParameters(GameActionParameterVisitor& visitor) +void MapChangeSizeAction::AcceptParameters(GameActionParameterVisitor& visitor) { visitor.Visit("targetSizeX", _targetSize.x); visitor.Visit("targetSizeY", _targetSize.y); diff --git a/src/openrct2/actions/ChangeMapSizeAction.h b/src/openrct2/actions/MapChangeSizeAction.h similarity index 82% rename from src/openrct2/actions/ChangeMapSizeAction.h rename to src/openrct2/actions/MapChangeSizeAction.h index 85cdd3460b..fc0990e645 100644 --- a/src/openrct2/actions/ChangeMapSizeAction.h +++ b/src/openrct2/actions/MapChangeSizeAction.h @@ -12,11 +12,11 @@ #include "../world/Map.h" #include "GameAction.h" -class ChangeMapSizeAction final : public GameActionBase +class MapChangeSizeAction final : public GameActionBase { public: - ChangeMapSizeAction() = default; - ChangeMapSizeAction(const TileCoordsXY& targetSize); + MapChangeSizeAction() = default; + MapChangeSizeAction(const TileCoordsXY& targetSize); void AcceptParameters(GameActionParameterVisitor& visitor) override; uint16_t GetActionFlags() const override; diff --git a/src/openrct2/libopenrct2.vcxproj b/src/openrct2/libopenrct2.vcxproj index 0ad14e0ac4..74b0373bdc 100644 --- a/src/openrct2/libopenrct2.vcxproj +++ b/src/openrct2/libopenrct2.vcxproj @@ -67,7 +67,6 @@ - @@ -90,6 +89,7 @@ + @@ -567,7 +567,6 @@ - @@ -591,6 +590,7 @@ + diff --git a/src/openrct2/network/NetworkAction.cpp b/src/openrct2/network/NetworkAction.cpp index 8291e06013..29bfeabcdb 100644 --- a/src/openrct2/network/NetworkAction.cpp +++ b/src/openrct2/network/NetworkAction.cpp @@ -198,7 +198,7 @@ const std::array(NetworkPermission::Count)> N GameCommand::PlaceParkEntrance, GameCommand::RemoveParkEntrance, GameCommand::PlacePeepSpawn, - GameCommand::ChangeMapSize, + GameCommand::MapChangeSize, }, }, NetworkAction{ diff --git a/src/openrct2/scripting/ScriptEngine.cpp b/src/openrct2/scripting/ScriptEngine.cpp index ac89d15193..2b8956cae2 100644 --- a/src/openrct2/scripting/ScriptEngine.cpp +++ b/src/openrct2/scripting/ScriptEngine.cpp @@ -1271,7 +1271,6 @@ const static EnumMap ActionNameToType = { { "bannersetcolour", GameCommand::SetBannerColour }, { "bannersetname", GameCommand::SetBannerName }, { "bannersetstyle", GameCommand::SetBannerStyle }, - { "changemapsize", GameCommand::ChangeMapSize }, { "clearscenery", GameCommand::ClearScenery }, { "climateset", GameCommand::SetClimate }, { "footpathplace", GameCommand::PlacePath }, @@ -1291,6 +1290,7 @@ const static EnumMap ActionNameToType = { { "largesceneryremove", GameCommand::RemoveLargeScenery }, { "largescenerysetcolour", GameCommand::SetLargeSceneryColour }, { "loadorquit", GameCommand::LoadOrQuit }, + { "mapChangeSize", GameCommand::MapChangeSize }, { "mazeplacetrack", GameCommand::PlaceMazeDesign }, { "mazesettrack", GameCommand::SetMazeTrack }, { "networkmodifygroup", GameCommand::ModifyGroups }, From f8ab17749dd1cd54f3b53084579d0d769e24b7d2 Mon Sep 17 00:00:00 2001 From: Stephan Spengler Date: Mon, 2 Jan 2023 14:19:46 +0100 Subject: [PATCH 3/4] Rename CheatSetAction to fit naming pattern --- distribution/openrct2.d.ts | 22 +++---- src/openrct2-ui/input/Shortcuts.cpp | 6 +- src/openrct2-ui/windows/Cheats.cpp | 6 +- src/openrct2-ui/windows/Transparency.cpp | 2 +- src/openrct2/Cheats.cpp | 6 +- src/openrct2/ReplayManager.cpp | 2 +- ...{SetCheatAction.cpp => CheatSetAction.cpp} | 58 +++++++++---------- .../{SetCheatAction.h => CheatSetAction.h} | 6 +- src/openrct2/actions/GameActionRegistry.cpp | 4 +- src/openrct2/interface/InteractiveConsole.cpp | 32 +++++----- src/openrct2/interface/Screenshot.cpp | 2 +- src/openrct2/libopenrct2.vcxproj | 4 +- src/openrct2/scripting/ScriptEngine.h | 2 +- 13 files changed, 76 insertions(+), 76 deletions(-) rename src/openrct2/actions/{SetCheatAction.cpp => CheatSetAction.cpp} (94%) rename src/openrct2/actions/{SetCheatAction.h => CheatSetAction.h} (92%) diff --git a/distribution/openrct2.d.ts b/distribution/openrct2.d.ts index 784912f123..8c1ce7768c 100644 --- a/distribution/openrct2.d.ts +++ b/distribution/openrct2.d.ts @@ -285,6 +285,7 @@ declare global { queryAction(action: "bannersetcolour", args: BannerSetColourArgs, callback?: (result: GameActionResult) => void): void; queryAction(action: "bannersetname", args: BannerSetNameArgs, callback?: (result: GameActionResult) => void): void; queryAction(action: "bannersetstyle", args: BannerSetStyleArgs, callback?: (result: GameActionResult) => void): void; + queryAction(action: "cheatset", args: CheatSetArgs, callback?: (result: GameActionResult) => void): void; queryAction(action: "clearscenery", args: ClearSceneryArgs, callback?: (result: GameActionResult) => void): void; queryAction(action: "climateset", args: ClimateSetArgs, callback?: (result: GameActionResult) => void): void; queryAction(action: "footpathadditionplace", args: FootpathAdditionPlaceArgs, callback?: (result: GameActionResult) => void): void; @@ -334,7 +335,6 @@ declare global { queryAction(action: "ridesetstatus", args: RideSetStatusArgs, callback?: (result: GameActionResult) => void): void; queryAction(action: "ridesetvehicle", args: RideSetVehicleArgs, callback?: (result: GameActionResult) => void): void; queryAction(action: "scenariosetsetting", args: ScenarioSetSettingArgs, callback?: (result: GameActionResult) => void): void; - queryAction(action: "setcheat", args: SetCheatArgs, callback?: (result: GameActionResult) => void): void; queryAction(action: "setparkentrancefee", args: SetParkEntranceFeeArgs, callback?: (result: GameActionResult) => void): void; queryAction(action: "signsetname", args: SignSetNameArgs, callback?: (result: GameActionResult) => void): void; queryAction(action: "signsetstyle", args: SignSetStyleArgs, callback?: (result: GameActionResult) => void): void; @@ -376,7 +376,7 @@ declare global { executeAction(action: "bannersetcolour", args: BannerSetColourArgs, callback?: (result: GameActionResult) => void): void; executeAction(action: "bannersetname", args: BannerSetNameArgs, callback?: (result: GameActionResult) => void): void; executeAction(action: "bannersetstyle", args: BannerSetStyleArgs, callback?: (result: GameActionResult) => void): void; - executeAction(action: "changemapsize", args: ChangeMapSizeArgs, callback?: (result: GameActionResult) => void): void; + executeAction(action: "cheatset", args: CheatSetArgs, callback?: (result: GameActionResult) => void): void; executeAction(action: "clearscenery", args: ClearSceneryArgs, callback?: (result: GameActionResult) => void): void; executeAction(action: "climateset", args: ClimateSetArgs, callback?: (result: GameActionResult) => void): void; executeAction(action: "footpathadditionplace", args: FootpathAdditionPlaceArgs, callback?: (result: GameActionResult) => void): void; @@ -396,6 +396,7 @@ declare global { executeAction(action: "largesceneryremove", args: LargeSceneryRemoveArgs, callback?: (result: GameActionResult) => void): void; executeAction(action: "largescenerysetcolour", args: LargeScenerySetColourArgs, callback?: (result: GameActionResult) => void): void; executeAction(action: "loadorquit", args: LoadOrQuitArgs, callback?: (result: GameActionResult) => void): void; + executeAction(action: "mapchangesize", args: MapChangeSizeArgs, callback?: (result: GameActionResult) => void): void; executeAction(action: "mazeplacetrack", args: MazePlaceTrackArgs, callback?: (result: GameActionResult) => void): void; executeAction(action: "mazesettrack", args: MazeSetTrackArgs, callback?: (result: GameActionResult) => void): void; executeAction(action: "networkmodifygroup", args: NetworkModifyGroupArgs, callback?: (result: GameActionResult) => void): void; @@ -425,7 +426,6 @@ declare global { executeAction(action: "ridesetstatus", args: RideSetStatusArgs, callback?: (result: GameActionResult) => void): void; executeAction(action: "ridesetvehicle", args: RideSetVehicleArgs, callback?: (result: GameActionResult) => void): void; executeAction(action: "scenariosetsetting", args: ScenarioSetSettingArgs, callback?: (result: GameActionResult) => void): void; - executeAction(action: "setcheat", args: SetCheatArgs, callback?: (result: GameActionResult) => void): void; executeAction(action: "setparkentrancefee", args: SetParkEntranceFeeArgs, callback?: (result: GameActionResult) => void): void; executeAction(action: "signsetname", args: SignSetNameArgs, callback?: (result: GameActionResult) => void): void; executeAction(action: "signsetstyle", args: SignSetStyleArgs, callback?: (result: GameActionResult) => void): void; @@ -609,7 +609,7 @@ declare global { "bannersetcolour" | "bannersetname" | "bannersetstyle" | - "changemapsize" | + "cheatset" | "clearscenery" | "climateset" | "footpathadditionplace" | @@ -629,6 +629,7 @@ declare global { "largesceneryremove" | "largescenerysetcolour" | "loadorquit" | + "mapchangesize" | "mazeplacetrack" | "mazesettrack" | "networkmodifygroup" | @@ -658,7 +659,6 @@ declare global { "ridesetstatus" | "ridesetvehicle" | "scenariosetsetting" | - "setcheat" | "setparkentrancefee" | "signsetname" | "signsetstyle" | @@ -729,6 +729,12 @@ declare global { parameter: number; // primary colour | secondary colour | 0: disable, 1: enable } + interface CheatSetArgs extends GameActionArgs { + type: number; // see CheatType in openrct2/Cheats.h + param1: number; // see openrct2/actions/CheatSetAction.cpp + param2: number; // see openrct2/actions/CheatSetAction.cpp + } + interface ClearSceneryArgs extends GameActionArgs { itemsToClear: number; // Bit mask. 1: small scenery and walls, 2: large scenery, 4: footpaths. } @@ -1080,12 +1086,6 @@ declare global { value: number; } - interface SetCheatArgs extends GameActionArgs { - type: number; // see CheatType in openrct2/Cheats.h - param1: number; // see openrct2/actions/SetCheatAction.cpp - param2: number; // see openrct2/actions/SetCheatAction.cpp - } - interface SetParkEntranceFeeArgs extends GameActionArgs { value: number; } diff --git a/src/openrct2-ui/input/Shortcuts.cpp b/src/openrct2-ui/input/Shortcuts.cpp index 7cc1bebd60..3ffdf5ae73 100644 --- a/src/openrct2-ui/input/Shortcuts.cpp +++ b/src/openrct2-ui/input/Shortcuts.cpp @@ -21,8 +21,8 @@ #include #include #include +#include #include -#include #include #include #include @@ -612,8 +612,8 @@ static void ShortcutDecreaseElementHeight() static void ShortcutToggleClearanceChecks() { - auto setCheatAction = SetCheatAction(CheatType::DisableClearanceChecks, gCheatsDisableClearanceChecks ? 0 : 1); - GameActions::Execute(&setCheatAction); + auto cheatSetAction = CheatSetAction(CheatType::DisableClearanceChecks, gCheatsDisableClearanceChecks ? 0 : 1); + GameActions::Execute(&cheatSetAction); } static void ShortcutToggleConsole() diff --git a/src/openrct2-ui/windows/Cheats.cpp b/src/openrct2-ui/windows/Cheats.cpp index b9b78cc62f..b904bebaa9 100644 --- a/src/openrct2-ui/windows/Cheats.cpp +++ b/src/openrct2-ui/windows/Cheats.cpp @@ -15,8 +15,8 @@ #include #include #include +#include #include -#include #include #include #include @@ -798,8 +798,8 @@ private: InvalidateWidget(WIDX_PARK_RATING_SPINNER); if (ParkGetForcedRating() >= 0) { - auto setCheatAction = SetCheatAction(CheatType::SetForcedParkRating, _parkRatingSpinnerValue); - GameActions::Execute(&setCheatAction); + auto cheatSetAction = CheatSetAction(CheatType::SetForcedParkRating, _parkRatingSpinnerValue); + GameActions::Execute(&cheatSetAction); } break; case WIDX_DECREASE_PARK_RATING: diff --git a/src/openrct2-ui/windows/Transparency.cpp b/src/openrct2-ui/windows/Transparency.cpp index 83bf367ea2..00cfe211b4 100644 --- a/src/openrct2-ui/windows/Transparency.cpp +++ b/src/openrct2-ui/windows/Transparency.cpp @@ -16,8 +16,8 @@ #include #include #include +#include #include -#include #include #include #include diff --git a/src/openrct2/Cheats.cpp b/src/openrct2/Cheats.cpp index 4bbedc7e5f..3f3321b056 100644 --- a/src/openrct2/Cheats.cpp +++ b/src/openrct2/Cheats.cpp @@ -10,8 +10,8 @@ #include "Cheats.h" #include "GameState.h" +#include "actions/CheatSetAction.h" #include "actions/ParkSetLoanAction.h" -#include "actions/SetCheatAction.h" #include "config/Config.h" #include "core/DataSerialiser.h" #include "localisation/Localisation.h" @@ -83,8 +83,8 @@ void CheatsReset() void CheatsSet(CheatType cheatType, int32_t param1 /* = 0*/, int32_t param2 /* = 0*/) { - auto setCheatAction = SetCheatAction(cheatType, param1, param2); - GameActions::Execute(&setCheatAction); + auto cheatSetAction = CheatSetAction(cheatType, param1, param2); + GameActions::Execute(&cheatSetAction); } template static void CheatEntrySerialise(DataSerialiser& ds, CheatType type, const T& value, uint16_t& count) diff --git a/src/openrct2/ReplayManager.cpp b/src/openrct2/ReplayManager.cpp index ea3711956b..9c8d525aa0 100644 --- a/src/openrct2/ReplayManager.cpp +++ b/src/openrct2/ReplayManager.cpp @@ -15,11 +15,11 @@ #include "OpenRCT2.h" #include "ParkImporter.h" #include "PlatformEnvironment.h" +#include "actions/CheatSetAction.h" #include "actions/FootpathPlaceAction.h" #include "actions/GameAction.h" #include "actions/RideEntranceExitPlaceAction.h" #include "actions/RideSetSettingAction.h" -#include "actions/SetCheatAction.h" #include "actions/TileModifyAction.h" #include "actions/TrackPlaceAction.h" #include "config/Config.h" diff --git a/src/openrct2/actions/SetCheatAction.cpp b/src/openrct2/actions/CheatSetAction.cpp similarity index 94% rename from src/openrct2/actions/SetCheatAction.cpp rename to src/openrct2/actions/CheatSetAction.cpp index 209319a0e5..59c1c46115 100644 --- a/src/openrct2/actions/SetCheatAction.cpp +++ b/src/openrct2/actions/CheatSetAction.cpp @@ -7,7 +7,7 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "SetCheatAction.h" +#include "CheatSetAction.h" #include "../Cheats.h" #include "../Context.h" @@ -40,32 +40,32 @@ using ParametersRange = std::pair, std::pair>; -SetCheatAction::SetCheatAction(CheatType cheatType, int32_t param1, int32_t param2) +CheatSetAction::CheatSetAction(CheatType cheatType, int32_t param1, int32_t param2) : _cheatType(static_cast(cheatType)) , _param1(param1) , _param2(param2) { } -void SetCheatAction::AcceptParameters(GameActionParameterVisitor& visitor) +void CheatSetAction::AcceptParameters(GameActionParameterVisitor& visitor) { visitor.Visit("type", _cheatType); visitor.Visit("param1", _param1); visitor.Visit("param2", _param2); } -uint16_t SetCheatAction::GetActionFlags() const +uint16_t CheatSetAction::GetActionFlags() const { return GameAction::GetActionFlags() | GameActions::Flags::AllowWhilePaused; } -void SetCheatAction::Serialise(DataSerialiser& stream) +void CheatSetAction::Serialise(DataSerialiser& stream) { GameAction::Serialise(stream); stream << DS_TAG(_cheatType) << DS_TAG(_param1) << DS_TAG(_param2); } -GameActions::Result SetCheatAction::Query() const +GameActions::Result CheatSetAction::Query() const { if (static_cast(_cheatType) >= static_cast(CheatType::Count)) { @@ -86,7 +86,7 @@ GameActions::Result SetCheatAction::Query() const return GameActions::Result(); } -GameActions::Result SetCheatAction::Execute() const +GameActions::Result CheatSetAction::Execute() const { switch (static_cast(_cheatType.id)) { @@ -260,7 +260,7 @@ GameActions::Result SetCheatAction::Execute() const return GameActions::Result(); } -ParametersRange SetCheatAction::GetParameterRange(CheatType cheatType) const +ParametersRange CheatSetAction::GetParameterRange(CheatType cheatType) const { switch (static_cast(_cheatType.id)) { @@ -360,7 +360,7 @@ ParametersRange SetCheatAction::GetParameterRange(CheatType cheatType) const } } -void SetCheatAction::SetGrassLength(int32_t length) const +void CheatSetAction::SetGrassLength(int32_t length) const { for (int32_t y = 0; y < gMapSize.y; y++) { @@ -381,7 +381,7 @@ void SetCheatAction::SetGrassLength(int32_t length) const gfx_invalidate_screen(); } -void SetCheatAction::WaterPlants() const +void CheatSetAction::WaterPlants() const { tile_element_iterator it; @@ -397,7 +397,7 @@ void SetCheatAction::WaterPlants() const gfx_invalidate_screen(); } -void SetCheatAction::FixVandalism() const +void CheatSetAction::FixVandalism() const { tile_element_iterator it; @@ -416,7 +416,7 @@ void SetCheatAction::FixVandalism() const gfx_invalidate_screen(); } -void SetCheatAction::RemoveLitter() const +void CheatSetAction::RemoveLitter() const { for (auto litter : EntityList()) { @@ -443,7 +443,7 @@ void SetCheatAction::RemoveLitter() const gfx_invalidate_screen(); } -void SetCheatAction::FixBrokenRides() const +void CheatSetAction::FixBrokenRides() const { for (auto& ride : GetRideManager()) { @@ -462,7 +462,7 @@ void SetCheatAction::FixBrokenRides() const } } -void SetCheatAction::RenewRides() const +void CheatSetAction::RenewRides() const { for (auto& ride : GetRideManager()) { @@ -471,7 +471,7 @@ void SetCheatAction::RenewRides() const window_invalidate_by_class(WindowClass::Ride); } -void SetCheatAction::MakeDestructible() const +void CheatSetAction::MakeDestructible() const { for (auto& ride : GetRideManager()) { @@ -481,7 +481,7 @@ void SetCheatAction::MakeDestructible() const window_invalidate_by_class(WindowClass::Ride); } -void SetCheatAction::ResetRideCrashStatus() const +void CheatSetAction::ResetRideCrashStatus() const { for (auto& ride : GetRideManager()) { @@ -492,7 +492,7 @@ void SetCheatAction::ResetRideCrashStatus() const window_invalidate_by_class(WindowClass::Ride); } -void SetCheatAction::Set10MinuteInspection() const +void CheatSetAction::Set10MinuteInspection() const { for (auto& ride : GetRideManager()) { @@ -502,7 +502,7 @@ void SetCheatAction::Set10MinuteInspection() const window_invalidate_by_class(WindowClass::Ride); } -void SetCheatAction::SetScenarioNoMoney(bool enabled) const +void CheatSetAction::SetScenarioNoMoney(bool enabled) const { if (enabled) { @@ -522,7 +522,7 @@ void SetCheatAction::SetScenarioNoMoney(bool enabled) const window_invalidate_by_class(WindowClass::Cheats); } -void SetCheatAction::SetMoney(money64 amount) const +void CheatSetAction::SetMoney(money64 amount) const { gCash = amount; @@ -530,7 +530,7 @@ void SetCheatAction::SetMoney(money64 amount) const window_invalidate_by_class(WindowClass::BottomToolbar); } -void SetCheatAction::AddMoney(money64 amount) const +void CheatSetAction::AddMoney(money64 amount) const { gCash = add_clamp_money64(gCash, amount); @@ -538,7 +538,7 @@ void SetCheatAction::AddMoney(money64 amount) const window_invalidate_by_class(WindowClass::BottomToolbar); } -void SetCheatAction::ClearLoan() const +void CheatSetAction::ClearLoan() const { // First give money AddMoney(gBankLoan); @@ -548,7 +548,7 @@ void SetCheatAction::ClearLoan() const GameActions::ExecuteNested(&gameAction); } -void SetCheatAction::GenerateGuests(int32_t count) const +void CheatSetAction::GenerateGuests(int32_t count) const { auto& park = OpenRCT2::GetContext()->GetGameState()->GetPark(); for (int32_t i = 0; i < count; i++) @@ -558,7 +558,7 @@ void SetCheatAction::GenerateGuests(int32_t count) const window_invalidate_by_class(WindowClass::BottomToolbar); } -void SetCheatAction::SetGuestParameter(int32_t parameter, int32_t value) const +void CheatSetAction::SetGuestParameter(int32_t parameter, int32_t value) const { for (auto peep : EntityList()) { @@ -602,7 +602,7 @@ void SetCheatAction::SetGuestParameter(int32_t parameter, int32_t value) const } } -void SetCheatAction::GiveObjectToGuests(int32_t object) const +void CheatSetAction::GiveObjectToGuests(int32_t object) const { for (auto peep : EntityList()) { @@ -629,7 +629,7 @@ void SetCheatAction::GiveObjectToGuests(int32_t object) const window_invalidate_by_class(WindowClass::Peep); } -void SetCheatAction::RemoveAllGuests() const +void CheatSetAction::RemoveAllGuests() const { for (auto& ride : GetRideManager()) { @@ -677,7 +677,7 @@ void SetCheatAction::RemoveAllGuests() const gfx_invalidate_screen(); } -void SetCheatAction::SetStaffSpeed(uint8_t value) const +void CheatSetAction::SetStaffSpeed(uint8_t value) const { for (auto peep : EntityList()) { @@ -686,7 +686,7 @@ void SetCheatAction::SetStaffSpeed(uint8_t value) const } } -void SetCheatAction::OwnAllLand() const +void CheatSetAction::OwnAllLand() const { const auto min = CoordsXY{ COORDS_XY_STEP, COORDS_XY_STEP }; const auto max = GetMapSizeUnits() - CoordsXY{ COORDS_XY_STEP, COORDS_XY_STEP }; @@ -732,13 +732,13 @@ void SetCheatAction::OwnAllLand() const MapCountRemainingLandRights(); } -void SetCheatAction::ParkSetOpen(bool isOpen) const +void CheatSetAction::ParkSetOpen(bool isOpen) const { auto parkSetParameter = ParkSetParameterAction(isOpen ? ParkParameter::Open : ParkParameter::Close); GameActions::ExecuteNested(&parkSetParameter); } -void SetCheatAction::CreateDucks(int count) const +void CheatSetAction::CreateDucks(int count) const { for (int i = 0; i < count; i++) { diff --git a/src/openrct2/actions/SetCheatAction.h b/src/openrct2/actions/CheatSetAction.h similarity index 92% rename from src/openrct2/actions/SetCheatAction.h rename to src/openrct2/actions/CheatSetAction.h index 360f8e4130..a218bb7500 100644 --- a/src/openrct2/actions/SetCheatAction.h +++ b/src/openrct2/actions/CheatSetAction.h @@ -11,7 +11,7 @@ #include "GameAction.h" -class SetCheatAction final : public GameActionBase +class CheatSetAction final : public GameActionBase { using ParametersRange = std::pair, std::pair>; @@ -21,8 +21,8 @@ private: int32_t _param2{}; public: - SetCheatAction() = default; - SetCheatAction(CheatType cheatType, int32_t param1 = 0, int32_t param2 = 0); + CheatSetAction() = default; + CheatSetAction(CheatType cheatType, int32_t param1 = 0, int32_t param2 = 0); void AcceptParameters(GameActionParameterVisitor& visitor) override; diff --git a/src/openrct2/actions/GameActionRegistry.cpp b/src/openrct2/actions/GameActionRegistry.cpp index 930b0f5420..b0cc9f2395 100644 --- a/src/openrct2/actions/GameActionRegistry.cpp +++ b/src/openrct2/actions/GameActionRegistry.cpp @@ -13,6 +13,7 @@ #include "BannerSetColourAction.h" #include "BannerSetNameAction.h" #include "BannerSetStyleAction.h" +#include "CheatSetAction.h" #include "ClearAction.h" #include "ClimateSetAction.h" #include "CustomAction.h" @@ -64,7 +65,6 @@ #include "RideSetStatusAction.h" #include "RideSetVehicleAction.h" #include "ScenarioSetSettingAction.h" -#include "SetCheatAction.h" #include "SetParkEntranceFeeAction.h" #include "SignSetNameAction.h" #include "SignSetStyleAction.h" @@ -204,7 +204,7 @@ namespace GameActions REGISTER_ACTION(WaterRaiseAction); REGISTER_ACTION(GuestSetFlagsAction); REGISTER_ACTION(ParkSetDateAction); - REGISTER_ACTION(SetCheatAction); + REGISTER_ACTION(CheatSetAction); REGISTER_ACTION(MapChangeSizeAction); #ifdef ENABLE_SCRIPTING REGISTER_ACTION(CustomAction); diff --git a/src/openrct2/interface/InteractiveConsole.cpp b/src/openrct2/interface/InteractiveConsole.cpp index 97ca05f25a..3b41c136ee 100644 --- a/src/openrct2/interface/InteractiveConsole.cpp +++ b/src/openrct2/interface/InteractiveConsole.cpp @@ -16,13 +16,13 @@ #include "../PlatformEnvironment.h" #include "../ReplayManager.h" #include "../Version.h" +#include "../actions/CheatSetAction.h" #include "../actions/ClimateSetAction.h" #include "../actions/ParkSetParameterAction.h" #include "../actions/RideFreezeRatingAction.h" #include "../actions/RideSetPriceAction.h" #include "../actions/RideSetSettingAction.h" #include "../actions/ScenarioSetSettingAction.h" -#include "../actions/SetCheatAction.h" #include "../actions/StaffSetCostumeAction.h" #include "../config/Config.h" #include "../core/Console.hpp" @@ -764,14 +764,14 @@ static int32_t cc_set(InteractiveConsole& console, const arguments_t& argv) money32 money = ToMoney64FromGBP(double_val[0]); if (gCash != money) { - auto setCheatAction = SetCheatAction(CheatType::SetMoney, money); - setCheatAction.SetCallback([&console](const GameAction*, const GameActions::Result* res) { + auto cheatSetAction = CheatSetAction(CheatType::SetMoney, money); + cheatSetAction.SetCallback([&console](const GameAction*, const GameActions::Result* res) { if (res->Error != GameActions::Status::Ok) console.WriteLineError("set money command failed, likely due to permissions."); else console.Execute("get money"); }); - GameActions::Execute(&setCheatAction); + GameActions::Execute(&cheatSetAction); } else { @@ -938,14 +938,14 @@ static int32_t cc_set(InteractiveConsole& console, const arguments_t& argv) } else if (argv[0] == "no_money" && invalidArguments(&invalidArgs, int_valid[0])) { - auto setCheatAction = SetCheatAction(CheatType::NoMoney, int_val[0] != 0); - setCheatAction.SetCallback([&console](const GameAction*, const GameActions::Result* res) { + auto cheatSetAction = CheatSetAction(CheatType::NoMoney, int_val[0] != 0); + cheatSetAction.SetCallback([&console](const GameAction*, const GameActions::Result* res) { if (res->Error != GameActions::Status::Ok) console.WriteLineError("set no_money command failed, likely due to permissions."); else console.Execute("get no_money"); }); - GameActions::Execute(&setCheatAction); + GameActions::Execute(&cheatSetAction); } else if (argv[0] == "difficult_park_rating" && invalidArguments(&invalidArgs, int_valid[0])) { @@ -1094,14 +1094,14 @@ static int32_t cc_set(InteractiveConsole& console, const arguments_t& argv) { if (gCheatsSandboxMode != (int_val[0] != 0)) { - auto setCheatAction = SetCheatAction(CheatType::SandboxMode, int_val[0] != 0); - setCheatAction.SetCallback([&console](const GameAction*, const GameActions::Result* res) { + auto cheatSetAction = CheatSetAction(CheatType::SandboxMode, int_val[0] != 0); + cheatSetAction.SetCallback([&console](const GameAction*, const GameActions::Result* res) { if (res->Error != GameActions::Status::Ok) console.WriteLineError("Network error: Permission denied!"); else console.Execute("get cheat_sandbox_mode"); }); - GameActions::Execute(&setCheatAction); + GameActions::Execute(&cheatSetAction); } else { @@ -1112,14 +1112,14 @@ static int32_t cc_set(InteractiveConsole& console, const arguments_t& argv) { if (gCheatsDisableClearanceChecks != (int_val[0] != 0)) { - auto setCheatAction = SetCheatAction(CheatType::DisableClearanceChecks, int_val[0] != 0); - setCheatAction.SetCallback([&console](const GameAction*, const GameActions::Result* res) { + auto cheatSetAction = CheatSetAction(CheatType::DisableClearanceChecks, int_val[0] != 0); + cheatSetAction.SetCallback([&console](const GameAction*, const GameActions::Result* res) { if (res->Error != GameActions::Status::Ok) console.WriteLineError("Network error: Permission denied!"); else console.Execute("get cheat_disable_clearance_checks"); }); - GameActions::Execute(&setCheatAction); + GameActions::Execute(&cheatSetAction); } else { @@ -1130,14 +1130,14 @@ static int32_t cc_set(InteractiveConsole& console, const arguments_t& argv) { if (gCheatsDisableSupportLimits != (int_val[0] != 0)) { - auto setCheatAction = SetCheatAction(CheatType::DisableSupportLimits, int_val[0] != 0); - setCheatAction.SetCallback([&console](const GameAction*, const GameActions::Result* res) { + auto cheatSetAction = CheatSetAction(CheatType::DisableSupportLimits, int_val[0] != 0); + cheatSetAction.SetCallback([&console](const GameAction*, const GameActions::Result* res) { if (res->Error != GameActions::Status::Ok) console.WriteLineError("Network error: Permission denied!"); else console.Execute("get cheat_disable_support_limits"); }); - GameActions::Execute(&setCheatAction); + GameActions::Execute(&cheatSetAction); } else { diff --git a/src/openrct2/interface/Screenshot.cpp b/src/openrct2/interface/Screenshot.cpp index d8889d50ae..f3c20756f8 100644 --- a/src/openrct2/interface/Screenshot.cpp +++ b/src/openrct2/interface/Screenshot.cpp @@ -15,7 +15,7 @@ #include "../Intro.h" #include "../OpenRCT2.h" #include "../PlatformEnvironment.h" -#include "../actions/SetCheatAction.h" +#include "../actions/CheatSetAction.h" #include "../audio/audio.h" #include "../core/Console.hpp" #include "../core/File.h" diff --git a/src/openrct2/libopenrct2.vcxproj b/src/openrct2/libopenrct2.vcxproj index 74b0373bdc..59c2cba937 100644 --- a/src/openrct2/libopenrct2.vcxproj +++ b/src/openrct2/libopenrct2.vcxproj @@ -67,6 +67,7 @@ + @@ -120,7 +121,6 @@ - @@ -567,6 +567,7 @@ + @@ -620,7 +621,6 @@ - diff --git a/src/openrct2/scripting/ScriptEngine.h b/src/openrct2/scripting/ScriptEngine.h index ae87e8c69e..c298960dba 100644 --- a/src/openrct2/scripting/ScriptEngine.h +++ b/src/openrct2/scripting/ScriptEngine.h @@ -46,7 +46,7 @@ namespace OpenRCT2 namespace OpenRCT2::Scripting { - static constexpr int32_t OPENRCT2_PLUGIN_API_VERSION = 67; + static constexpr int32_t OPENRCT2_PLUGIN_API_VERSION = 68; // Versions marking breaking changes. static constexpr int32_t API_VERSION_33_PEEP_DEPRECATION = 33; From bfcf66a8f7575bd08ca48b579050b06d98740a31 Mon Sep 17 00:00:00 2001 From: Stephan Spengler Date: Mon, 2 Jan 2023 14:42:28 +0100 Subject: [PATCH 4/4] Rename ParkSetEntranceFee to fit naming pattern --- distribution/changelog.txt | 2 +- distribution/openrct2.d.ts | 14 +++++++------- src/openrct2-ui/windows/Park.cpp | 6 +++--- src/openrct2/Game.h | 2 +- src/openrct2/actions/GameActionRegistry.cpp | 4 ++-- src/openrct2/actions/MapChangeSizeAction.h | 2 +- ...eFeeAction.cpp => ParkSetEntranceFeeAction.cpp} | 14 +++++++------- ...ranceFeeAction.h => ParkSetEntranceFeeAction.h} | 6 +++--- src/openrct2/libopenrct2.vcxproj | 4 ++-- src/openrct2/network/NetworkAction.cpp | 2 +- src/openrct2/scripting/ScriptEngine.cpp | 4 ++-- test/tests/PlayTests.cpp | 6 +++--- 12 files changed, 33 insertions(+), 33 deletions(-) rename src/openrct2/actions/{SetParkEntranceFeeAction.cpp => ParkSetEntranceFeeAction.cpp} (77%) rename src/openrct2/actions/{SetParkEntranceFeeAction.h => ParkSetEntranceFeeAction.h} (84%) diff --git a/distribution/changelog.txt b/distribution/changelog.txt index df1879550e..7bb106983d 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -8,8 +8,8 @@ - Improved: [#18826] [Plugin] Added all actions and their documentation to plugin API. - Improved: [#18945] Languages can now fall back to other languages than English. - Improved: [#18970] Trying to load a non-park save will now display a context error. -- Improved: [#19018] Renamed actions to fit the naming scheme. - Improved: [#19044] Added special thanks to RMC and Wiegand to the About page. +- Change: [#19018] Renamed actions to fit the naming scheme. - Fix: [#18467] “Selected only” Object Selection filter is active in Track Designs Manager, and cannot be toggled. - Fix: [#18905] Ride Construction window theme is not applied correctly. - Fix: [#18911] Mini Golf station does not draw correctly from all angles. diff --git a/distribution/openrct2.d.ts b/distribution/openrct2.d.ts index 8c1ce7768c..5cee798c92 100644 --- a/distribution/openrct2.d.ts +++ b/distribution/openrct2.d.ts @@ -313,6 +313,7 @@ declare global { queryAction(action: "parkentranceremove", args: ParkEntranceRemoveArgs, callback?: (result: GameActionResult) => void): void; queryAction(action: "parkmarketing", args: ParkMarketingArgs, callback?: (result: GameActionResult) => void): void; queryAction(action: "parksetdate", args: ParkSetDateArgs, callback?: (result: GameActionResult) => void): void; + queryAction(action: "parksetentrancefee", args: ParkSetEntranceFeeArgs, callback?: (result: GameActionResult) => void): void; queryAction(action: "parksetloan", args: ParkSetLoanArgs, callback?: (result: GameActionResult) => void): void; queryAction(action: "parksetname", args: ParkSetNameArgs, callback?: (result: GameActionResult) => void): void; queryAction(action: "parksetparameter", args: ParkSetParameterArgs, callback?: (result: GameActionResult) => void): void; @@ -335,7 +336,6 @@ declare global { queryAction(action: "ridesetstatus", args: RideSetStatusArgs, callback?: (result: GameActionResult) => void): void; queryAction(action: "ridesetvehicle", args: RideSetVehicleArgs, callback?: (result: GameActionResult) => void): void; queryAction(action: "scenariosetsetting", args: ScenarioSetSettingArgs, callback?: (result: GameActionResult) => void): void; - queryAction(action: "setparkentrancefee", args: SetParkEntranceFeeArgs, callback?: (result: GameActionResult) => void): void; queryAction(action: "signsetname", args: SignSetNameArgs, callback?: (result: GameActionResult) => void): void; queryAction(action: "signsetstyle", args: SignSetStyleArgs, callback?: (result: GameActionResult) => void): void; queryAction(action: "smallsceneryplace", args: SmallSceneryPlaceArgs, callback?: (result: GameActionResult) => void): void; @@ -404,6 +404,7 @@ declare global { executeAction(action: "parkentranceremove", args: ParkEntranceRemoveArgs, callback?: (result: GameActionResult) => void): void; executeAction(action: "parkmarketing", args: ParkMarketingArgs, callback?: (result: GameActionResult) => void): void; executeAction(action: "parksetdate", args: ParkSetDateArgs, callback?: (result: GameActionResult) => void): void; + executeAction(action: "parksetentrancefee", args: ParkSetEntranceFeeArgs, callback?: (result: GameActionResult) => void): void; executeAction(action: "parksetloan", args: ParkSetLoanArgs, callback?: (result: GameActionResult) => void): void; executeAction(action: "parksetname", args: ParkSetNameArgs, callback?: (result: GameActionResult) => void): void; executeAction(action: "parksetparameter", args: ParkSetParameterArgs, callback?: (result: GameActionResult) => void): void; @@ -426,7 +427,6 @@ declare global { executeAction(action: "ridesetstatus", args: RideSetStatusArgs, callback?: (result: GameActionResult) => void): void; executeAction(action: "ridesetvehicle", args: RideSetVehicleArgs, callback?: (result: GameActionResult) => void): void; executeAction(action: "scenariosetsetting", args: ScenarioSetSettingArgs, callback?: (result: GameActionResult) => void): void; - executeAction(action: "setparkentrancefee", args: SetParkEntranceFeeArgs, callback?: (result: GameActionResult) => void): void; executeAction(action: "signsetname", args: SignSetNameArgs, callback?: (result: GameActionResult) => void): void; executeAction(action: "signsetstyle", args: SignSetStyleArgs, callback?: (result: GameActionResult) => void): void; executeAction(action: "smallsceneryplace", args: SmallSceneryPlaceArgs, callback?: (result: GameActionResult) => void): void; @@ -637,6 +637,7 @@ declare global { "parkentranceremove" | "parkmarketing" | "parksetdate" | + "parksetentrancefee" | "parksetloan" | "parksetname" | "parksetparameter" | @@ -659,7 +660,6 @@ declare global { "ridesetstatus" | "ridesetvehicle" | "scenariosetsetting" | - "setparkentrancefee" | "signsetname" | "signsetstyle" | "smallsceneryplace" | @@ -949,6 +949,10 @@ declare global { day: number; } + interface ParkSetEntranceFeeArgs extends GameActionArgs { + value: number; + } + interface ParkSetLoanArgs extends GameActionArgs { value: number; } @@ -1086,10 +1090,6 @@ declare global { value: number; } - interface SetParkEntranceFeeArgs extends GameActionArgs { - value: number; - } - interface SignSetNameArgs extends GameActionArgs { id: number; name: string; diff --git a/src/openrct2-ui/windows/Park.cpp b/src/openrct2-ui/windows/Park.cpp index 282065b4f0..c401aa9a99 100644 --- a/src/openrct2-ui/windows/Park.cpp +++ b/src/openrct2-ui/windows/Park.cpp @@ -22,8 +22,8 @@ #include #include #include +#include #include -#include #include #include #include @@ -828,14 +828,14 @@ private: case WIDX_INCREASE_PRICE: { const auto newFee = std::min(MAX_ENTRANCE_FEE, gParkEntranceFee + 1.00_GBP); - auto gameAction = SetParkEntranceFeeAction(static_cast(newFee)); + auto gameAction = ParkSetEntranceFeeAction(static_cast(newFee)); GameActions::Execute(&gameAction); break; } case WIDX_DECREASE_PRICE: { const auto newFee = std::max(0.00_GBP, gParkEntranceFee - 1.00_GBP); - auto gameAction = SetParkEntranceFeeAction(static_cast(newFee)); + auto gameAction = ParkSetEntranceFeeAction(static_cast(newFee)); GameActions::Execute(&gameAction); break; } diff --git a/src/openrct2/Game.h b/src/openrct2/Game.h index 1122899753..71ff2d20ad 100644 --- a/src/openrct2/Game.h +++ b/src/openrct2/Game.h @@ -101,7 +101,7 @@ enum class GameCommand : int32_t GuestSetFlags, // GA SetDate, // GA Custom, // GA - MapChangeSize, + ChangeMapSize, FreezeRideRating, Count, }; diff --git a/src/openrct2/actions/GameActionRegistry.cpp b/src/openrct2/actions/GameActionRegistry.cpp index b0cc9f2395..ad89abd454 100644 --- a/src/openrct2/actions/GameActionRegistry.cpp +++ b/src/openrct2/actions/GameActionRegistry.cpp @@ -43,6 +43,7 @@ #include "ParkEntranceRemoveAction.h" #include "ParkMarketingAction.h" #include "ParkSetDateAction.h" +#include "ParkSetEntranceFeeAction.h" #include "ParkSetLoanAction.h" #include "ParkSetNameAction.h" #include "ParkSetParameterAction.h" @@ -65,7 +66,6 @@ #include "RideSetStatusAction.h" #include "RideSetVehicleAction.h" #include "ScenarioSetSettingAction.h" -#include "SetParkEntranceFeeAction.h" #include "SignSetNameAction.h" #include "SignSetStyleAction.h" #include "SmallSceneryPlaceAction.h" @@ -165,7 +165,7 @@ namespace GameActions REGISTER_ACTION(RideSetVehicleAction); REGISTER_ACTION(RideSetSettingAction); REGISTER_ACTION(ScenarioSetSettingAction); - REGISTER_ACTION(SetParkEntranceFeeAction); + REGISTER_ACTION(ParkSetEntranceFeeAction); REGISTER_ACTION(SignSetNameAction); REGISTER_ACTION(SignSetStyleAction); REGISTER_ACTION(StaffFireAction); diff --git a/src/openrct2/actions/MapChangeSizeAction.h b/src/openrct2/actions/MapChangeSizeAction.h index fc0990e645..c469966633 100644 --- a/src/openrct2/actions/MapChangeSizeAction.h +++ b/src/openrct2/actions/MapChangeSizeAction.h @@ -12,7 +12,7 @@ #include "../world/Map.h" #include "GameAction.h" -class MapChangeSizeAction final : public GameActionBase +class MapChangeSizeAction final : public GameActionBase { public: MapChangeSizeAction() = default; diff --git a/src/openrct2/actions/SetParkEntranceFeeAction.cpp b/src/openrct2/actions/ParkSetEntranceFeeAction.cpp similarity index 77% rename from src/openrct2/actions/SetParkEntranceFeeAction.cpp rename to src/openrct2/actions/ParkSetEntranceFeeAction.cpp index ef9f9026b9..9f0d861c80 100644 --- a/src/openrct2/actions/SetParkEntranceFeeAction.cpp +++ b/src/openrct2/actions/ParkSetEntranceFeeAction.cpp @@ -7,7 +7,7 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "SetParkEntranceFeeAction.h" +#include "ParkSetEntranceFeeAction.h" #include "../Cheats.h" #include "../core/MemoryStream.h" @@ -15,29 +15,29 @@ #include "../localisation/StringIds.h" #include "../world/Park.h" -SetParkEntranceFeeAction::SetParkEntranceFeeAction(money16 fee) +ParkSetEntranceFeeAction::ParkSetEntranceFeeAction(money16 fee) : _fee(fee) { } -void SetParkEntranceFeeAction::AcceptParameters(GameActionParameterVisitor& visitor) +void ParkSetEntranceFeeAction::AcceptParameters(GameActionParameterVisitor& visitor) { visitor.Visit("value", _fee); } -uint16_t SetParkEntranceFeeAction::GetActionFlags() const +uint16_t ParkSetEntranceFeeAction::GetActionFlags() const { return GameAction::GetActionFlags() | GameActions::Flags::AllowWhilePaused; } -void SetParkEntranceFeeAction::Serialise(DataSerialiser& stream) +void ParkSetEntranceFeeAction::Serialise(DataSerialiser& stream) { GameAction::Serialise(stream); stream << DS_TAG(_fee); } -GameActions::Result SetParkEntranceFeeAction::Query() const +GameActions::Result ParkSetEntranceFeeAction::Query() const { bool noMoney = (gParkFlags & PARK_FLAGS_NO_MONEY) != 0; bool forceFreeEntry = !ParkEntranceFeeUnlocked(); @@ -52,7 +52,7 @@ GameActions::Result SetParkEntranceFeeAction::Query() const return GameActions::Result(); } -GameActions::Result SetParkEntranceFeeAction::Execute() const +GameActions::Result ParkSetEntranceFeeAction::Execute() const { gParkEntranceFee = _fee; window_invalidate_by_class(WindowClass::ParkInformation); diff --git a/src/openrct2/actions/SetParkEntranceFeeAction.h b/src/openrct2/actions/ParkSetEntranceFeeAction.h similarity index 84% rename from src/openrct2/actions/SetParkEntranceFeeAction.h rename to src/openrct2/actions/ParkSetEntranceFeeAction.h index bb2e0b1fd5..8e25d345d2 100644 --- a/src/openrct2/actions/SetParkEntranceFeeAction.h +++ b/src/openrct2/actions/ParkSetEntranceFeeAction.h @@ -11,14 +11,14 @@ #include "GameAction.h" -class SetParkEntranceFeeAction final : public GameActionBase +class ParkSetEntranceFeeAction final : public GameActionBase { private: money16 _fee{ MONEY16_UNDEFINED }; public: - SetParkEntranceFeeAction() = default; - SetParkEntranceFeeAction(money16 fee); + ParkSetEntranceFeeAction() = default; + ParkSetEntranceFeeAction(money16 fee); void AcceptParameters(GameActionParameterVisitor& visitor) override; diff --git a/src/openrct2/libopenrct2.vcxproj b/src/openrct2/libopenrct2.vcxproj index 59c2cba937..6a28c224c6 100644 --- a/src/openrct2/libopenrct2.vcxproj +++ b/src/openrct2/libopenrct2.vcxproj @@ -98,6 +98,7 @@ + @@ -121,7 +122,6 @@ - @@ -598,6 +598,7 @@ + @@ -621,7 +622,6 @@ - diff --git a/src/openrct2/network/NetworkAction.cpp b/src/openrct2/network/NetworkAction.cpp index 29bfeabcdb..8291e06013 100644 --- a/src/openrct2/network/NetworkAction.cpp +++ b/src/openrct2/network/NetworkAction.cpp @@ -198,7 +198,7 @@ const std::array(NetworkPermission::Count)> N GameCommand::PlaceParkEntrance, GameCommand::RemoveParkEntrance, GameCommand::PlacePeepSpawn, - GameCommand::MapChangeSize, + GameCommand::ChangeMapSize, }, }, NetworkAction{ diff --git a/src/openrct2/scripting/ScriptEngine.cpp b/src/openrct2/scripting/ScriptEngine.cpp index 2b8956cae2..7062967bac 100644 --- a/src/openrct2/scripting/ScriptEngine.cpp +++ b/src/openrct2/scripting/ScriptEngine.cpp @@ -1290,7 +1290,7 @@ const static EnumMap ActionNameToType = { { "largesceneryremove", GameCommand::RemoveLargeScenery }, { "largescenerysetcolour", GameCommand::SetLargeSceneryColour }, { "loadorquit", GameCommand::LoadOrQuit }, - { "mapChangeSize", GameCommand::MapChangeSize }, + { "mapChangeSize", GameCommand::ChangeMapSize }, { "mazeplacetrack", GameCommand::PlaceMazeDesign }, { "mazesettrack", GameCommand::SetMazeTrack }, { "networkmodifygroup", GameCommand::ModifyGroups }, @@ -1298,6 +1298,7 @@ const static EnumMap ActionNameToType = { { "parkentranceremove", GameCommand::RemoveParkEntrance }, { "parkmarketing", GameCommand::StartMarketingCampaign }, { "parksetdate", GameCommand::SetDate }, + { "parksetentrancefee", GameCommand::SetParkEntranceFee }, { "parksetloan", GameCommand::SetCurrentLoan }, { "parksetname", GameCommand::SetParkName }, { "parksetparameter", GameCommand::SetParkOpen }, @@ -1321,7 +1322,6 @@ const static EnumMap ActionNameToType = { { "ridesetvehicle", GameCommand::SetRideVehicles }, { "scenariosetsetting", GameCommand::EditScenarioOptions }, { "setcheat", GameCommand::Cheat }, - { "setparkentrancefee", GameCommand::SetParkEntranceFee }, { "signsetname", GameCommand::SetSignName }, { "signsetstyle", GameCommand::SetSignStyle }, { "smallsceneryplace", GameCommand::PlaceScenery }, diff --git a/test/tests/PlayTests.cpp b/test/tests/PlayTests.cpp index 0467d1acbd..8c771a909a 100644 --- a/test/tests/PlayTests.cpp +++ b/test/tests/PlayTests.cpp @@ -16,10 +16,10 @@ #include #include #include +#include #include #include #include -#include #include #include #include @@ -99,7 +99,7 @@ TEST_F(PlayTests, SecondGuestInQueueShouldNotRideIfNoFunds) // Open park for free but charging for rides execute(ParkParameter::Open); - execute(0); + execute(0); gParkFlags |= PARK_FLAGS_UNLOCK_ALL_PRICES; // Find ferris wheel @@ -160,7 +160,7 @@ TEST_F(PlayTests, CarRideWithOneCarOnlyAcceptsTwoGuests) // Open park for free but charging for rides execute(ParkParameter::Open); - execute(0); + execute(0); gParkFlags |= PARK_FLAGS_UNLOCK_ALL_PRICES; // Find car ride