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

#15634: Refactor passing GameActions::Result by copy (#15951)

Browse Source 
* Refactor to result GameActions::Result as copy instead of unique_ptr

* Remove alias GameActions::Result::Ptr

* Remove MakeResult wrapper

* Remove type forwarder in TileInspector
This commit is contained in:
ζeh Matt
2021-11-23 23:35:08 -08:00
committed by GitHub
parent 23491c8125
commit 83b911b193
191 changed files with 1983 additions and 1978 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -220,11 +220,11 @@ namespace OpenRCT2::Scripting
void AddNetworkPlugin(std::string_view code);
[[nodiscard]] std::unique_ptr<GameActions::Result> QueryOrExecuteCustomGameAction(
[[nodiscard]] GameActions::Result QueryOrExecuteCustomGameAction(
std::string_view id, std::string_view args, 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, std::unique_ptr<GameActions::Result>& result, bool isExecute);
void RunGameActionHooks(const GameAction& action, GameActions::Result& result, bool isExecute);
[[nodiscard]] std::unique_ptr<GameAction> CreateGameAction(const std::string& actionid, const DukValue& args);
void SaveSharedStorage();
@@ -249,9 +249,8 @@ namespace OpenRCT2::Scripting
void AutoReloadPlugins();
void ProcessREPL();
void RemoveCustomGameActions(const std::shared_ptr<Plugin>& plugin);
[[nodiscard]] std::unique_ptr<GameActions::Result> DukToGameActionResult(const DukValue& d);
[[nodiscard]] DukValue GameActionResultToDuk(
const GameAction& action, const std::unique_ptr<GameActions::Result>& result);
[[nodiscard]] GameActions::Result DukToGameActionResult(const DukValue& d);
[[nodiscard]] DukValue GameActionResultToDuk(const GameAction& action, const GameActions::Result& result);
static std::string_view ExpenditureTypeToString(ExpenditureType expenditureType);
static ExpenditureType StringToExpenditureType(std::string_view expenditureType);