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

16
src/openrct2/actions/SetCheatAction.cpp
View File

@@ -65,28 +65,28 @@ void SetCheatAction::Serialise(DataSerialiser& stream)
stream << DS_TAG(_cheatType) << DS_TAG(_param1) << DS_TAG(_param2);
}
GameActions::Result::Ptr SetCheatAction::Query() const
GameActions::Result SetCheatAction::Query() const
{
if (static_cast<uint32_t>(_cheatType) >= static_cast<uint32_t>(CheatType::Count))
{
MakeResult(GameActions::Status::InvalidParameters, STR_NONE, STR_NONE);
GameActions::Result(GameActions::Status::InvalidParameters, STR_NONE, STR_NONE);
}
ParametersRange validRange = GetParameterRange(static_cast<CheatType>(_cheatType.id));
if (_param1 < validRange.first.first || _param1 > validRange.first.second)
{
MakeResult(GameActions::Status::InvalidParameters, STR_NONE, STR_NONE);
GameActions::Result(GameActions::Status::InvalidParameters, STR_NONE, STR_NONE);
}
if (_param2 < validRange.second.first || _param2 > validRange.second.second)
{
MakeResult(GameActions::Status::InvalidParameters, STR_NONE, STR_NONE);
GameActions::Result(GameActions::Status::InvalidParameters, STR_NONE, STR_NONE);
}
return MakeResult();
return GameActions::Result();
}
GameActions::Result::Ptr SetCheatAction::Execute() const
GameActions::Result SetCheatAction::Execute() const
{
switch (static_cast<CheatType>(_cheatType.id))
{
@@ -243,7 +243,7 @@ GameActions::Result::Ptr SetCheatAction::Execute() const
default:
{
log_error("Unabled cheat: %d", _cheatType.id);
MakeResult(GameActions::Status::InvalidParameters, STR_NONE, STR_NONE);
GameActions::Result(GameActions::Status::InvalidParameters, STR_NONE, STR_NONE);
}
break;
}
@@ -254,7 +254,7 @@ GameActions::Result::Ptr SetCheatAction::Execute() const
}
window_invalidate_by_class(WC_CHEATS);
return MakeResult();
return GameActions::Result();
}
ParametersRange SetCheatAction::GetParameterRange(CheatType cheatType) const