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

Closes #12419: Merge MISC_COMMAND and GAME_COMMAND into strong enum (#13103)

Browse Source 
Merge MISC_COMMAND and GAME_COMMAND enums

Cleanup
This commit is contained in:
Mike Jones
2020-12-22 23:53:37 +00:00
committed by GitHub
parent fa5437f920
commit 4e991beb8d
92 changed files with 384 additions and 377 deletions
Download Patch File Download Diff File Expand all files Collapse all files

168
src/openrct2/scripting/ScriptEngine.cpp
View File

@@ -850,7 +850,7 @@ DukValue ScriptEngine::GameActionResultToDuk(const GameAction& action, const std
obj.Set("expenditureType", ExpenditureTypeToString(result->Expenditure));
}
if (action.GetType() == GAME_COMMAND_CREATE_RIDE)
if (action.GetType() == GameCommand::CreateRide)
{
auto& rideCreateResult = static_cast<RideCreateGameActionResult&>(*result.get());
if (rideCreateResult.rideIndex != RIDE_ID_NULL)
@@ -858,7 +858,7 @@ DukValue ScriptEngine::GameActionResultToDuk(const GameAction& action, const std
obj.Set("ride", rideCreateResult.rideIndex);
}
}
else if (action.GetType() == GAME_COMMAND_HIRE_NEW_STAFF_MEMBER)
else if (action.GetType() == GameCommand::HireNewStaffMember)
{
auto& staffHireResult = static_cast<StaffHireNewActionResult&>(*result.get());
if (staffHireResult.peepSriteIndex != SPRITE_INDEX_NULL)
@@ -960,88 +960,88 @@ public:
}
};
const static std::unordered_map<std::string, uint32_t> ActionNameToType = {
{ "balloonpress", GAME_COMMAND_BALLOON_PRESS },
{ "bannerplace", GAME_COMMAND_PLACE_BANNER },
{ "bannerremove", GAME_COMMAND_REMOVE_BANNER },
{ "bannersetcolour", GAME_COMMAND_SET_BANNER_COLOUR },
{ "bannersetname", GAME_COMMAND_SET_BANNER_NAME },
{ "bannersetstyle", GAME_COMMAND_SET_BANNER_STYLE },
{ "clearscenery", GAME_COMMAND_CLEAR_SCENERY },
{ "climateset", GAME_COMMAND_SET_CLIMATE },
{ "footpathplace", GAME_COMMAND_PLACE_PATH },
{ "footpathplacefromtrack", GAME_COMMAND_PLACE_PATH_FROM_TRACK },
{ "footpathremove", GAME_COMMAND_REMOVE_PATH },
{ "footpathadditionplace", GAME_COMMAND_PLACE_FOOTPATH_ADDITION },
{ "footpathadditionremove", GAME_COMMAND_REMOVE_FOOTPATH_ADDITION },
{ "guestsetflags", GAME_COMMAND_GUEST_SET_FLAGS },
{ "guestsetname", GAME_COMMAND_SET_GUEST_NAME },
{ "landbuyrights", GAME_COMMAND_BUY_LAND_RIGHTS },
{ "landlower", GAME_COMMAND_LOWER_LAND },
{ "landraise", GAME_COMMAND_RAISE_LAND },
{ "landsetheight", GAME_COMMAND_SET_LAND_HEIGHT },
{ "landsetrights", GAME_COMMAND_SET_LAND_OWNERSHIP },
{ "landsmoothaction", GAME_COMMAND_EDIT_LAND_SMOOTH },
{ "largesceneryplace", GAME_COMMAND_PLACE_LARGE_SCENERY },
{ "largesceneryremove", GAME_COMMAND_REMOVE_LARGE_SCENERY },
{ "largescenerysetcolour", GAME_COMMAND_SET_SCENERY_COLOUR },
{ "loadorquit", GAME_COMMAND_LOAD_OR_QUIT },
{ "mazeplacetrack", GAME_COMMAND_PLACE_MAZE_DESIGN },
{ "mazesettrack", GAME_COMMAND_SET_MAZE_TRACK },
{ "networkmodifygroup", GAME_COMMAND_MODIFY_GROUPS },
{ "parkentranceremove", GAME_COMMAND_REMOVE_PARK_ENTRANCE },
{ "parkmarketing", GAME_COMMAND_START_MARKETING_CAMPAIGN },
{ "parksetdate", GAME_COMMAND_SET_DATE },
{ "parksetloan", GAME_COMMAND_SET_CURRENT_LOAN },
{ "parksetname", GAME_COMMAND_SET_PARK_NAME },
{ "parksetparameter", GAME_COMMAND_SET_PARK_OPEN },
{ "parksetresearchfunding", GAME_COMMAND_SET_RESEARCH_FUNDING },
{ "pausetoggle", GAME_COMMAND_TOGGLE_PAUSE },
{ "peeppickup", GAME_COMMAND_PICKUP_GUEST },
{ "placeparkentrance", GAME_COMMAND_PLACE_PARK_ENTRANCE },
{ "placepeepspawn", GAME_COMMAND_PLACE_PEEP_SPAWN },
{ "playerkick", GAME_COMMAND_KICK_PLAYER },
{ "playersetgroup", GAME_COMMAND_SET_PLAYER_GROUP },
{ "ridecreate", GAME_COMMAND_CREATE_RIDE },
{ "ridedemolish", GAME_COMMAND_DEMOLISH_RIDE },
{ "rideentranceexitplace", GAME_COMMAND_PLACE_RIDE_ENTRANCE_OR_EXIT },
{ "rideentranceexitremove", GAME_COMMAND_REMOVE_RIDE_ENTRANCE_OR_EXIT },
{ "ridesetappearance", GAME_COMMAND_SET_RIDE_APPEARANCE },
{ "ridesetcolourscheme", GAME_COMMAND_SET_COLOUR_SCHEME },
{ "ridesetname", GAME_COMMAND_SET_RIDE_NAME },
{ "ridesetprice", GAME_COMMAND_SET_RIDE_PRICE },
{ "ridesetsetting", GAME_COMMAND_SET_RIDE_SETTING },
{ "ridesetstatus", GAME_COMMAND_SET_RIDE_STATUS },
{ "ridesetvehicles", GAME_COMMAND_SET_RIDE_VEHICLES },
{ "scenariosetsetting", GAME_COMMAND_EDIT_SCENARIO_OPTIONS },
{ "setcheataction", GAME_COMMAND_CHEAT },
{ "setparkentrancefee", GAME_COMMAND_SET_PARK_ENTRANCE_FEE },
{ "signsetname", GAME_COMMAND_SET_SIGN_NAME },
{ "signsetstyle", GAME_COMMAND_SET_SIGN_STYLE },
{ "smallsceneryplace", GAME_COMMAND_PLACE_SCENERY },
{ "smallsceneryremove", GAME_COMMAND_REMOVE_SCENERY },
{ "stafffire", GAME_COMMAND_FIRE_STAFF_MEMBER },
{ "staffhire", GAME_COMMAND_HIRE_NEW_STAFF_MEMBER },
{ "staffsetcolour", GAME_COMMAND_SET_STAFF_COLOUR },
{ "staffsetcostume", GAME_COMMAND_SET_STAFF_COSTUME },
{ "staffsetname", GAME_COMMAND_SET_STAFF_NAME },
{ "staffsetorders", GAME_COMMAND_SET_STAFF_ORDERS },
{ "staffsetpatrolarea", GAME_COMMAND_SET_STAFF_PATROL },
{ "surfacesetstyle", GAME_COMMAND_CHANGE_SURFACE_STYLE },
{ "tilemodify", GAME_COMMAND_MODIFY_TILE },
{ "trackdesign", GAME_COMMAND_PLACE_TRACK_DESIGN },
{ "trackplace", GAME_COMMAND_PLACE_TRACK },
{ "trackremove", GAME_COMMAND_REMOVE_TRACK },
{ "tracksetbrakespeed", GAME_COMMAND_SET_BRAKES_SPEED },
{ "wallplace", GAME_COMMAND_PLACE_WALL },
{ "wallremove", GAME_COMMAND_REMOVE_WALL },
{ "wallsetcolour", GAME_COMMAND_SET_WALL_COLOUR },
{ "waterlower", GAME_COMMAND_LOWER_WATER },
{ "waterraise", GAME_COMMAND_RAISE_WATER },
{ "watersetheight", GAME_COMMAND_SET_WATER_HEIGHT }
const static std::unordered_map<std::string, GameCommand> ActionNameToType = {
{ "balloonpress", GameCommand::BalloonPress },
{ "bannerplace", GameCommand::PlaceBanner },
{ "bannerremove", GameCommand::RemoveBanner },
{ "bannersetcolour", GameCommand::SetBannerColour },
{ "bannersetname", GameCommand::SetBannerName },
{ "bannersetstyle", GameCommand::SetBannerStyle },
{ "clearscenery", GameCommand::ClearScenery },
{ "climateset", GameCommand::SetClimate },
{ "footpathplace", GameCommand::PlacePath },
{ "footpathplacefromtrack", GameCommand::PlacePathFromTrack },
{ "footpathremove", GameCommand::RemovePath },
{ "footpathadditionplace", GameCommand::PlaceFootpathAddition },
{ "footpathadditionremove", GameCommand::RemoveFootpathAddition },
{ "guestsetflags", GameCommand::GuestSetFlags },
{ "guestsetname", GameCommand::SetGuestName },
{ "landbuyrights", GameCommand::BuyLandRights },
{ "landlower", GameCommand::LowerLand },
{ "landraise", GameCommand::RaiseLand },
{ "landsetheight", GameCommand::SetLandHeight },
{ "landsetrights", GameCommand::SetLandOwnership },
{ "landsmoothaction", GameCommand::EditLandSmooth },
{ "largesceneryplace", GameCommand::PlaceLargeScenery },
{ "largesceneryremove", GameCommand::RemoveLargeScenery },
{ "largescenerysetcolour", GameCommand::SetSceneryColour },
{ "loadorquit", GameCommand::LoadOrQuit },
{ "mazeplacetrack", GameCommand::PlaceMazeDesign },
{ "mazesettrack", GameCommand::SetMazeTrack },
{ "networkmodifygroup", GameCommand::ModifyGroups },
{ "parkentranceremove", GameCommand::RemoveParkEntrance },
{ "parkmarketing", GameCommand::StartMarketingCampaign },
{ "parksetdate", GameCommand::SetDate },
{ "parksetloan", GameCommand::SetCurrentLoan },
{ "parksetname", GameCommand::SetParkName },
{ "parksetparameter", GameCommand::SetParkOpen },
{ "parksetresearchfunding", GameCommand::SetResearchFunding },
{ "pausetoggle", GameCommand::TogglePause },
{ "peeppickup", GameCommand::PickupGuest },
{ "placeparkentrance", GameCommand::PlaceParkEntrance },
{ "placepeepspawn", GameCommand::PlacePeepSpawn },
{ "playerkick", GameCommand::KickPlayer },
{ "playersetgroup", GameCommand::SetPlayerGroup },
{ "ridecreate", GameCommand::CreateRide },
{ "ridedemolish", GameCommand::DemolishRide },
{ "rideentranceexitplace", GameCommand::PlaceRideEntranceOrExit },
{ "rideentranceexitremove", GameCommand::RemoveRideEntranceOrExit },
{ "ridesetappearance", GameCommand::SetRideAppearance },
{ "ridesetcolourscheme", GameCommand::SetColourScheme },
{ "ridesetname", GameCommand::SetRideName },
{ "ridesetprice", GameCommand::SetRidePrice },
{ "ridesetsetting", GameCommand::SetRideSetting },
{ "ridesetstatus", GameCommand::SetRideStatus },
{ "ridesetvehicles", GameCommand::SetRideVehicles },
{ "scenariosetsetting", GameCommand::EditScenarioOptions },
{ "setcheataction", GameCommand::Cheat },
{ "setparkentrancefee", GameCommand::SetParkEntranceFee },
{ "signsetname", GameCommand::SetSignName },
{ "signsetstyle", GameCommand::SetSignStyle },
{ "smallsceneryplace", GameCommand::PlaceScenery },
{ "smallsceneryremove", GameCommand::RemoveScenery },
{ "stafffire", GameCommand::FireStaffMember },
{ "staffhire", GameCommand::HireNewStaffMember },
{ "staffsetcolour", GameCommand::SetStaffColour },
{ "staffsetcostume", GameCommand::SetStaffCostume },
{ "staffsetname", GameCommand::SetStaffName },
{ "staffsetorders", GameCommand::SetStaffOrders },
{ "staffsetpatrolarea", GameCommand::SetStaffPatrol },
{ "surfacesetstyle", GameCommand::ChangeSurfaceStyle },
{ "tilemodify", GameCommand::ModifyTile },
{ "trackdesign", GameCommand::PlaceTrackDesign },
{ "trackplace", GameCommand::PlaceTrack },
{ "trackremove", GameCommand::RemoveTrack },
{ "tracksetbrakespeed", GameCommand::SetBrakesSpeed },
{ "wallplace", GameCommand::PlaceWall },
{ "wallremove", GameCommand::RemoveWall },
{ "wallsetcolour", GameCommand::SetWallColour },
{ "waterlower", GameCommand::LowerWater },
{ "waterraise", GameCommand::RaiseWater },
{ "watersetheight", GameCommand::SetWaterHeight }
};
static std::string GetActionName(uint32_t commandId)
static std::string GetActionName(GameCommand commandId)
{
auto it = std::find_if(
ActionNameToType.begin(), ActionNameToType.end(), [commandId](const auto& kvp) { return kvp.second == commandId; });
@@ -1072,7 +1072,7 @@ void ScriptEngine::RunGameActionHooks(const GameAction& action, std::unique_ptr<
DukObject obj(_context);
auto actionId = action.GetType();
if (action.GetType() == GAME_COMMAND_CUSTOM)
if (action.GetType() == GameCommand::Custom)
{
auto customAction = static_cast<const CustomAction&>(action);
obj.Set("action", customAction.GetId());
@@ -1104,7 +1104,7 @@ void ScriptEngine::RunGameActionHooks(const GameAction& action, std::unique_ptr<
}
obj.Set("player", action.GetPlayer());
obj.Set("type", actionId);
obj.Set("type", EnumValue(actionId));
auto flags = action.GetActionFlags();
obj.Set("isClientOnly", (flags & GameActions::Flags::ClientOnly) != 0);