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

Use `if... else if`

This commit is contained in:
Peter Froud 2024-03-24 21:07:34 -07:00 committed by Gymnasiast
parent 869d1b398b
commit c4b7845c26
No known key found for this signature in database
GPG Key ID: DBFFF47AB2CA3EDD
4 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/openrct2/actions/LargeSceneryPlaceAction.cpp
View File

@ -75,18 +75,17 @@ GameActions::Result LargeSceneryPlaceAction::Query() const
LOG_ERROR("Invalid primary colour %u", _primaryColour);
return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_POSITION_THIS_HERE, STR_ERR_INVALID_COLOUR);
}
if (_secondaryColour >= COLOUR_COUNT)
else if (_secondaryColour >= COLOUR_COUNT)
{
LOG_ERROR("Invalid secondary colour %u", _secondaryColour);
return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_POSITION_THIS_HERE, STR_ERR_INVALID_COLOUR);
}
if (_tertiaryColour >= COLOUR_COUNT)
else if (_tertiaryColour >= COLOUR_COUNT)
{
LOG_ERROR("Invalid tertiary colour %u", _tertiaryColour);
return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_POSITION_THIS_HERE, STR_ERR_INVALID_COLOUR);
}
if (_sceneryType >= MAX_LARGE_SCENERY_OBJECTS)
else if (_sceneryType >= MAX_LARGE_SCENERY_OBJECTS)
{
LOG_ERROR("Invalid sceneryType %u", _sceneryType);
return GameActions::Result(

6
src/openrct2/actions/LargeScenerySetColourAction.cpp
View File

@ -78,14 +78,12 @@ GameActions::Result LargeScenerySetColourAction::QueryExecute(bool isExecuting)
LOG_ERROR("Invalid primary colour %u", _primaryColour);
return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS, STR_ERR_INVALID_COLOUR);
}
if (_secondaryColour >= COLOUR_COUNT)
else if (_secondaryColour >= COLOUR_COUNT)
{
LOG_ERROR("Invalid secondary colour %u", _secondaryColour);
return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS, STR_ERR_INVALID_COLOUR);
}
if (_tertiaryColour >= COLOUR_COUNT)
else if (_tertiaryColour >= COLOUR_COUNT)
{
LOG_ERROR("Invalid tertiary colour %u", _tertiaryColour);
return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS, STR_ERR_INVALID_COLOUR);

4
src/openrct2/actions/ParkSetDateAction.cpp
View File

@ -51,13 +51,13 @@ GameActions::Result ParkSetDateAction::Query() const
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE);
}
if (_month < 0 || _month >= MONTH_COUNT)
else if (_month < 0 || _month >= MONTH_COUNT)
{
LOG_ERROR("Invalid park date month %d", _year);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE);
}
if (_day < 0 || _day >= 31)
else if (_day < 0 || _day >= 31)
{
LOG_ERROR("Invalid park date day %d", _year);
return GameActions::Result(

6
src/openrct2/actions/WallSetColourAction.cpp
View File

@ -99,14 +99,12 @@ GameActions::Result WallSetColourAction::Query() const
LOG_ERROR("Primary colour invalid: colour = %d", _primaryColour);
return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS, STR_ERR_INVALID_COLOUR);
}
if (_secondaryColour >= COLOUR_COUNT)
else if (_secondaryColour >= COLOUR_COUNT)
{
LOG_ERROR("Secondary colour invalid: colour = %d", _secondaryColour);
return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS, STR_ERR_INVALID_COLOUR);
}
if (wallEntry->flags & WALL_SCENERY_HAS_TERTIARY_COLOUR)
else if (wallEntry->flags & WALL_SCENERY_HAS_TERTIARY_COLOUR)
{
if (_tertiaryColour >= COLOUR_COUNT)
{