mirror of https://github.com/OpenRCT2/OpenRCT2.git
Use `if... else if`
This commit is contained in:
parent
869d1b398b
commit
c4b7845c26
|
@ -75,18 +75,17 @@ GameActions::Result LargeSceneryPlaceAction::Query() const
|
||||||
LOG_ERROR("Invalid primary colour %u", _primaryColour);
|
LOG_ERROR("Invalid primary colour %u", _primaryColour);
|
||||||
return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_POSITION_THIS_HERE, STR_ERR_INVALID_COLOUR);
|
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);
|
LOG_ERROR("Invalid secondary colour %u", _secondaryColour);
|
||||||
return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_POSITION_THIS_HERE, STR_ERR_INVALID_COLOUR);
|
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);
|
LOG_ERROR("Invalid tertiary colour %u", _tertiaryColour);
|
||||||
return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_POSITION_THIS_HERE, STR_ERR_INVALID_COLOUR);
|
return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_POSITION_THIS_HERE, STR_ERR_INVALID_COLOUR);
|
||||||
}
|
}
|
||||||
|
else if (_sceneryType >= MAX_LARGE_SCENERY_OBJECTS)
|
||||||
if (_sceneryType >= MAX_LARGE_SCENERY_OBJECTS)
|
|
||||||
{
|
{
|
||||||
LOG_ERROR("Invalid sceneryType %u", _sceneryType);
|
LOG_ERROR("Invalid sceneryType %u", _sceneryType);
|
||||||
return GameActions::Result(
|
return GameActions::Result(
|
||||||
|
|
|
@ -78,14 +78,12 @@ GameActions::Result LargeScenerySetColourAction::QueryExecute(bool isExecuting)
|
||||||
LOG_ERROR("Invalid primary colour %u", _primaryColour);
|
LOG_ERROR("Invalid primary colour %u", _primaryColour);
|
||||||
return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS, STR_ERR_INVALID_COLOUR);
|
return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS, STR_ERR_INVALID_COLOUR);
|
||||||
}
|
}
|
||||||
|
else if (_secondaryColour >= COLOUR_COUNT)
|
||||||
if (_secondaryColour >= COLOUR_COUNT)
|
|
||||||
{
|
{
|
||||||
LOG_ERROR("Invalid secondary colour %u", _secondaryColour);
|
LOG_ERROR("Invalid secondary colour %u", _secondaryColour);
|
||||||
return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS, STR_ERR_INVALID_COLOUR);
|
return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS, STR_ERR_INVALID_COLOUR);
|
||||||
}
|
}
|
||||||
|
else if (_tertiaryColour >= COLOUR_COUNT)
|
||||||
if (_tertiaryColour >= COLOUR_COUNT)
|
|
||||||
{
|
{
|
||||||
LOG_ERROR("Invalid tertiary colour %u", _tertiaryColour);
|
LOG_ERROR("Invalid tertiary colour %u", _tertiaryColour);
|
||||||
return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS, STR_ERR_INVALID_COLOUR);
|
return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS, STR_ERR_INVALID_COLOUR);
|
||||||
|
|
|
@ -51,13 +51,13 @@ GameActions::Result ParkSetDateAction::Query() const
|
||||||
return GameActions::Result(
|
return GameActions::Result(
|
||||||
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE);
|
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);
|
LOG_ERROR("Invalid park date month %d", _year);
|
||||||
return GameActions::Result(
|
return GameActions::Result(
|
||||||
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE);
|
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);
|
LOG_ERROR("Invalid park date day %d", _year);
|
||||||
return GameActions::Result(
|
return GameActions::Result(
|
||||||
|
|
|
@ -99,14 +99,12 @@ GameActions::Result WallSetColourAction::Query() const
|
||||||
LOG_ERROR("Primary colour invalid: colour = %d", _primaryColour);
|
LOG_ERROR("Primary colour invalid: colour = %d", _primaryColour);
|
||||||
return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS, STR_ERR_INVALID_COLOUR);
|
return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS, STR_ERR_INVALID_COLOUR);
|
||||||
}
|
}
|
||||||
|
else if (_secondaryColour >= COLOUR_COUNT)
|
||||||
if (_secondaryColour >= COLOUR_COUNT)
|
|
||||||
{
|
{
|
||||||
LOG_ERROR("Secondary colour invalid: colour = %d", _secondaryColour);
|
LOG_ERROR("Secondary colour invalid: colour = %d", _secondaryColour);
|
||||||
return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS, STR_ERR_INVALID_COLOUR);
|
return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS, STR_ERR_INVALID_COLOUR);
|
||||||
}
|
}
|
||||||
|
else if (wallEntry->flags & WALL_SCENERY_HAS_TERTIARY_COLOUR)
|
||||||
if (wallEntry->flags & WALL_SCENERY_HAS_TERTIARY_COLOUR)
|
|
||||||
{
|
{
|
||||||
if (_tertiaryColour >= COLOUR_COUNT)
|
if (_tertiaryColour >= COLOUR_COUNT)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue