mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-02-02 11:45:13 +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

12
src/openrct2/actions/ScenarioSetSettingAction.cpp
View File

@@ -26,18 +26,18 @@ void ScenarioSetSettingAction::Serialise(DataSerialiser& stream)
stream << DS_TAG(_setting) << DS_TAG(_value);
}
GameActions::Result::Ptr ScenarioSetSettingAction::Query() const
GameActions::Result ScenarioSetSettingAction::Query() const
{
if (_setting >= ScenarioSetSetting::Count)
{
log_error("Invalid setting: %u", _setting);
return MakeResult(GameActions::Status::InvalidParameters, STR_NONE, STR_NONE);
return GameActions::Result(GameActions::Status::InvalidParameters, STR_NONE, STR_NONE);
}
return MakeResult();
return GameActions::Result();
}
GameActions::Result::Ptr ScenarioSetSettingAction::Execute() const
GameActions::Result ScenarioSetSettingAction::Execute() const
{
switch (_setting)
{
@@ -242,8 +242,8 @@ GameActions::Result::Ptr ScenarioSetSettingAction::Execute() const
break;
default:
log_error("Invalid setting: %u", _setting);
return MakeResult(GameActions::Status::InvalidParameters, STR_NONE, STR_NONE);
return GameActions::Result(GameActions::Status::InvalidParameters, STR_NONE, STR_NONE);
}
window_invalidate_by_class(WC_EDITOR_SCENARIO_OPTIONS);
return MakeResult();
return GameActions::Result();
}