mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-22 07:13:07 +01:00
Code Issues Releases Wiki Activity

Use VALUE_OUF_OF_RANGE for spriteId checks

Browse Source 
Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
This commit is contained in:
Peter Froud
2024-01-29 02:50:52 -08:00
parent 21bda5e5e4
commit a382e4be8a
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/openrct2/actions/StaffFireAction.cpp
View File

@@ -39,7 +39,8 @@ GameActions::Result StaffFireAction::Query() const
if (_spriteId.ToUnderlying() >= MAX_ENTITIES || _spriteId.IsNull()) if (_spriteId.ToUnderlying() >= MAX_ENTITIES || _spriteId.IsNull())
{ {
LOG_ERROR("Invalid spriteId. spriteId = %u", _spriteId); LOG_ERROR("Invalid spriteId. spriteId = %u", _spriteId);
return GameActions::Result(GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_STAFF_NOT_FOUND); return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE);
} }
auto staff = TryGetEntity<Staff>(_spriteId); auto staff = TryGetEntity<Staff>(_spriteId);

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

@@ -64,7 +64,8 @@ GameActions::Result StaffSetCostumeAction::Query() const
{ {
if (_spriteIndex.ToUnderlying() >= MAX_ENTITIES || _spriteIndex.IsNull()) if (_spriteIndex.ToUnderlying() >= MAX_ENTITIES || _spriteIndex.IsNull())
{ {
return GameActions::Result(GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_STAFF_NOT_FOUND); return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE);
} }
auto* staff = TryGetEntity<Staff>(_spriteIndex); auto* staff = TryGetEntity<Staff>(_spriteIndex);

3
src/openrct2/actions/StaffSetOrdersAction.cpp
View File

@@ -45,7 +45,8 @@ GameActions::Result StaffSetOrdersAction::Query() const
{ {
if (_spriteIndex.ToUnderlying() >= MAX_ENTITIES || _spriteIndex.IsNull()) if (_spriteIndex.ToUnderlying() >= MAX_ENTITIES || _spriteIndex.IsNull())
{ {
return GameActions::Result(GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_STAFF_NOT_FOUND); return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE);
} }
auto* staff = TryGetEntity<Staff>(_spriteIndex); auto* staff = TryGetEntity<Staff>(_spriteIndex);