mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-29 09:44:52 +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

10
src/openrct2/actions/ClimateSetAction.cpp
View File

@@ -31,21 +31,21 @@ void ClimateSetAction::Serialise(DataSerialiser& stream)
stream << DS_TAG(_climate);
}
GameActions::Result::Ptr ClimateSetAction::Query() const
GameActions::Result ClimateSetAction::Query() const
{
if (_climate >= ClimateType::Count)
{
return std::make_unique<GameActions::Result>(GameActions::Status::InvalidParameters, STR_INVALID_CLIMATE_ID, STR_NONE);
return GameActions::Result(GameActions::Status::InvalidParameters, STR_INVALID_CLIMATE_ID, STR_NONE);
}
return std::make_unique<GameActions::Result>();
return GameActions::Result();
}
GameActions::Result::Ptr ClimateSetAction::Execute() const
GameActions::Result ClimateSetAction::Execute() const
{
gClimate = ClimateType{ _climate };
gfx_invalidate_screen();
return std::make_unique<GameActions::Result>();
return GameActions::Result();
}