Refactor explicit constructor usage in StaffSetPatrolAreaAction

This commit is contained in:
ζeh Matt 2021-10-21 20:31:16 +03:00
parent 6600f813de
commit 86a07d7f48
No known key found for this signature in database
GPG Key ID: 18CE582C71A225B0
1 changed files with 4 additions and 4 deletions

View File

@ -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)