mirror of https://github.com/OpenRCT2/OpenRCT2.git
Refactor explicit constructor usage in StaffSetPatrolAreaAction
This commit is contained in:
parent
6600f813de
commit
86a07d7f48
|
@ -37,19 +37,19 @@ GameActions::Result::Ptr StaffSetPatrolAreaAction::Query() const
|
||||||
if (_spriteId >= MAX_ENTITIES)
|
if (_spriteId >= MAX_ENTITIES)
|
||||||
{
|
{
|
||||||
log_error("Invalid spriteId. spriteId = %u", _spriteId);
|
log_error("Invalid spriteId. spriteId = %u", _spriteId);
|
||||||
return MakeResult(GameActions::Status::InvalidParameters, STR_NONE);
|
return MakeResult(GameActions::Status::InvalidParameters, STR_NONE, STR_NONE);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!LocationValid(_loc))
|
if (!LocationValid(_loc))
|
||||||
{
|
{
|
||||||
return MakeResult(GameActions::Status::InvalidParameters, STR_NONE);
|
return MakeResult(GameActions::Status::InvalidParameters, STR_NONE, STR_NONE);
|
||||||
}
|
}
|
||||||
|
|
||||||
auto staff = TryGetEntity<Staff>(_spriteId);
|
auto staff = TryGetEntity<Staff>(_spriteId);
|
||||||
if (staff == nullptr)
|
if (staff == nullptr)
|
||||||
{
|
{
|
||||||
log_error("Invalid spriteId. spriteId = %u", _spriteId);
|
log_error("Invalid spriteId. spriteId = %u", _spriteId);
|
||||||
return MakeResult(GameActions::Status::InvalidParameters, STR_NONE);
|
return MakeResult(GameActions::Status::InvalidParameters, STR_NONE, STR_NONE);
|
||||||
}
|
}
|
||||||
|
|
||||||
return MakeResult();
|
return MakeResult();
|
||||||
|
@ -97,7 +97,7 @@ GameActions::Result::Ptr StaffSetPatrolAreaAction::Execute() const
|
||||||
if (staff == nullptr)
|
if (staff == nullptr)
|
||||||
{
|
{
|
||||||
log_error("Invalid spriteId. spriteId = %u", _spriteId);
|
log_error("Invalid spriteId. spriteId = %u", _spriteId);
|
||||||
return MakeResult(GameActions::Status::InvalidParameters, STR_NONE);
|
return MakeResult(GameActions::Status::InvalidParameters, STR_NONE, STR_NONE);
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (_mode)
|
switch (_mode)
|
||||||
|
|
Loading…
Reference in New Issue