From 32dd535044fef745a9eca1cdb843973715dc38c1 Mon Sep 17 00:00:00 2001 From: Stephan Spengler Date: Mon, 2 Jan 2023 13:52:38 +0100 Subject: [PATCH] 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 },