mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refactor explicit constructor usage in StaffSetCostumeAction

This commit is contained in:
ζeh Matt 2021-10-21 20:30:45 +03:00
parent 219d49aee1
commit 6600f813de
No known key found for this signature in database
GPG Key ID: 18CE582C71A225B0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/openrct2/actions/StaffSetCostumeAction.cpp
View File

@ -58,21 +58,21 @@ GameActions::Result::Ptr StaffSetCostumeAction::Query() const
{
if (_spriteIndex >= MAX_ENTITIES)
{
return std::make_unique<GameActions::Result>(GameActions::Status::InvalidParameters, STR_NONE);
return std::make_unique<GameActions::Result>(GameActions::Status::InvalidParameters, STR_NONE, STR_NONE);
}
auto* staff = TryGetEntity<Staff>(_spriteIndex);
if (staff == nullptr)
{
log_warning("Invalid game command for sprite %u", _spriteIndex);
return std::make_unique<GameActions::Result>(GameActions::Status::InvalidParameters, STR_NONE);
return std::make_unique<GameActions::Result>(GameActions::Status::InvalidParameters, STR_NONE, STR_NONE);
}
auto spriteType = EntertainerCostumeToSprite(_costume);
if (EnumValue(spriteType) > std::size(peep_slow_walking_types))
{
log_warning("Invalid game command for sprite %u", _spriteIndex);
return std::make_unique<GameActions::Result>(GameActions::Status::InvalidParameters, STR_NONE);
return std::make_unique<GameActions::Result>(GameActions::Status::InvalidParameters, STR_NONE, STR_NONE);
}
return std::make_unique<GameActions::Result>();
}
@ -83,7 +83,7 @@ GameActions::Result::Ptr StaffSetCostumeAction::Execute() const
if (staff == nullptr)
{
log_warning("Invalid game command for sprite %u", _spriteIndex);
return std::make_unique<GameActions::Result>(GameActions::Status::InvalidParameters, STR_NONE);
return std::make_unique<GameActions::Result>(GameActions::Status::InvalidParameters, STR_NONE, STR_NONE);
}
auto spriteType = EntertainerCostumeToSprite(_costume);