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

Move Footpath game actions into GameActions namespace

Browse Source
This commit is contained in:
Aaron van Geffen
2025-08-26 14:48:16 +02:00
parent e8ef3897df
commit bcb803df96
18 changed files with 1066 additions and 1064 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1072,7 +1072,7 @@ void ScriptEngine::RemoveNetworkPlugins()
}
}
GameActions::Result ScriptEngine::QueryOrExecuteCustomGameAction(const CustomAction& customAction, bool isExecute)
GameActions::Result ScriptEngine::QueryOrExecuteCustomGameAction(const GameActions::CustomAction& customAction, bool isExecute)
{
std::string actionz = customAction.GetId();
auto kvp = _customActions.find(actionz);
@@ -1473,7 +1473,7 @@ void ScriptEngine::RunGameActionHooks(const GameAction& action, GameActions::Res
auto actionId = action.GetType();
if (action.GetType() == GameCommand::Custom)
{
auto customAction = static_cast<const CustomAction&>(action);
auto customAction = static_cast<const GameActions::CustomAction&>(action);
obj.Set("action", customAction.GetId());
auto dukArgs = DuktapeTryParseJson(_context, customAction.GetJson());
@@ -1559,7 +1559,7 @@ std::unique_ptr<GameAction> ScriptEngine::CreateGameAction(
auto jsonz = duk_json_encode(ctx, -1);
auto json = std::string(jsonz);
duk_pop(ctx);
auto customAction = std::make_unique<CustomAction>(actionid, json, pluginName);
auto customAction = std::make_unique<GameActions::CustomAction>(actionid, json, pluginName);
if (customAction->GetPlayer() == -1 && NetworkGetMode() != NETWORK_MODE_NONE)
{

3
src/openrct2/scripting/ScriptEngine.h
View File

@@ -248,7 +248,8 @@ namespace OpenRCT2::Scripting
void AddNetworkPlugin(std::string_view code);
void RemoveNetworkPlugins();
[[nodiscard]] GameActions::Result QueryOrExecuteCustomGameAction(const CustomAction& action, bool isExecute);
[[nodiscard]] GameActions::Result QueryOrExecuteCustomGameAction(
const GameActions::CustomAction& action, bool isExecute);
bool RegisterCustomAction(
const std::shared_ptr<Plugin>& plugin, std::string_view action, const DukValue& query, const DukValue& execute);
void RunGameActionHooks(const GameAction& action, GameActions::Result& result, bool isExecute);