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

Run clang-format

This commit is contained in:
Peter Froud 2024-01-22 02:29:08 -08:00
parent 648941aa11
commit 4145f851da
24 changed files with 147 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/openrct2/actions/BalloonPressAction.cpp
View File

@ -40,8 +40,8 @@ GameActions::Result BalloonPressAction::Query() const
if (balloon == nullptr)
{
LOG_ERROR("Tried getting invalid sprite for balloon: %u", _spriteIndex);
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_BALLOON_NOT_FOUND);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_BALLOON_NOT_FOUND);
}
return GameActions::Result();
}
@ -52,8 +52,8 @@ GameActions::Result BalloonPressAction::Execute() const
if (balloon == nullptr)
{
LOG_ERROR("Tried getting invalid sprite for balloon: %u", _spriteIndex);
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_BALLOON_NOT_FOUND);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_BALLOON_NOT_FOUND);
}
balloon->Press();

16
src/openrct2/actions/CheatSetAction.cpp
View File

@ -72,21 +72,21 @@ GameActions::Result CheatSetAction::Query() const
{
if (static_cast<uint32_t>(_cheatType) >= static_cast<uint32_t>(CheatType::Count))
{
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE);
}
ParametersRange validRange = GetParameterRange(static_cast<CheatType>(_cheatType.id));
if (_param1 < validRange.first.first || _param1 > validRange.first.second)
{
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE);
}
if (_param2 < validRange.second.first || _param2 > validRange.second.second)
{
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE);
}
return GameActions::Result();
@ -259,8 +259,8 @@ GameActions::Result CheatSetAction::Execute() const
default:
{
LOG_ERROR("Unabled cheat: %d", _cheatType.id);
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE);
}
break;
}

8
src/openrct2/actions/GameSetSpeedAction.cpp
View File

@ -40,8 +40,8 @@ GameActions::Result GameSetSpeedAction::Query() const
if (!IsValidSpeed(_speed))
{
LOG_WARNING("Invalid game command for speed %u", _speed);
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE);
}
return res;
@ -54,8 +54,8 @@ GameActions::Result GameSetSpeedAction::Execute() const
if (!IsValidSpeed(_speed))
{
LOG_WARNING("Invalid game command for speed %u", _speed);
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE);
}
gGameSpeed = _speed;

8
src/openrct2/actions/LandSetHeightAction.cpp
View File

@ -102,8 +102,8 @@ GameActions::Result LandSetHeightAction::Query() const
auto* surfaceElement = MapGetSurfaceElementAt(_coords);
if (surfaceElement == nullptr)
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_SURFACE_ELEMENT_NOT_FOUND);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_SURFACE_ELEMENT_NOT_FOUND);
// We need to check if there is _currently_ a level crossing on the tile.
// For that, we need the old height, so we can't use the _height variable.
@ -164,8 +164,8 @@ GameActions::Result LandSetHeightAction::Execute() const
auto* surfaceElement = MapGetSurfaceElementAt(_coords);
if (surfaceElement == nullptr)
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_SURFACE_ELEMENT_NOT_FOUND);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_SURFACE_ELEMENT_NOT_FOUND);
cost += GetSurfaceHeightChangeCost(surfaceElement);
SetSurfaceHeight(reinterpret_cast<TileElement*>(surfaceElement));

8
src/openrct2/actions/LandSetRightsAction.cpp
View File

@ -116,8 +116,8 @@ GameActions::Result LandSetRightsAction::MapBuyLandRightsForTile(const CoordsXY&
if (surfaceElement == nullptr)
{
LOG_ERROR("Could not find surface. x = %d, y = %d", loc.x, loc.y);
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_SURFACE_ELEMENT_NOT_FOUND);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_SURFACE_ELEMENT_NOT_FOUND);
}
auto res = GameActions::Result();
@ -204,7 +204,7 @@ GameActions::Result LandSetRightsAction::MapBuyLandRightsForTile(const CoordsXY&
}
default:
LOG_WARNING("Tried calling set land rights with an incorrect setting. setting = %u", _setting);
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE);
}
}

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

@ -47,8 +47,8 @@ GameActions::Result ParkSetDateAction::Query() const
{
if (_year < 0 || _year >= MAX_YEAR || _month < 0 || _month >= MONTH_COUNT || _day < 0 || _day >= 31)
{
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE);
}
return GameActions::Result();

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

@ -47,8 +47,8 @@ GameActions::Result ParkSetEntranceFeeAction::Query() const
}
if (_fee < 0.00_GBP || _fee > MAX_ENTRANCE_FEE)
{
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE);
}
return GameActions::Result();
}

8
src/openrct2/actions/ParkSetParameterAction.cpp
View File

@ -41,8 +41,8 @@ GameActions::Result ParkSetParameterAction::Query() const
{
if (_parameter >= ParkParameter::Count)
{
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE);
}
auto res = GameActions::Result();
@ -73,8 +73,8 @@ GameActions::Result ParkSetParameterAction::Execute() const
WindowInvalidateByClass(WindowClass::Ride);
break;
default:
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE);
}
auto res = GameActions::Result();

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

@ -44,8 +44,8 @@ GameActions::Result ParkSetResearchFundingAction::Query() const
{
if (_fundingAmount >= RESEARCH_FUNDING_COUNT)
{
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE);
}
return GameActions::Result();
}

18
src/openrct2/actions/RideEntranceExitRemoveAction.cpp
View File

@ -70,8 +70,7 @@ GameActions::Result RideEntranceExitRemoveAction::Query() const
if (ride == nullptr)
{
LOG_WARNING("Invalid ride id %u for entrance/exit removal", _rideIndex.ToUnderlying());
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_RIDE_NOT_FOUND);
return GameActions::Result(GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_RIDE_NOT_FOUND);
}
if (ride->status != RideStatus::Closed && ride->status != RideStatus::Simulating)
@ -102,8 +101,8 @@ GameActions::Result RideEntranceExitRemoveAction::Query() const
LOG_WARNING(
"Entrance not found. x = %d, y = %d, ride = %u, station = %u", _loc.x, _loc.y, _rideIndex.ToUnderlying(),
_stationNum.ToUnderlying());
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_ENTRANCE_ELEMENT_NOT_FOUND);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_ENTRANCE_ELEMENT_NOT_FOUND);
}
return GameActions::Result();
@ -115,8 +114,7 @@ GameActions::Result RideEntranceExitRemoveAction::Execute() const
if (ride == nullptr)
{
LOG_WARNING("Invalid ride id %u for entrance/exit removal", _rideIndex.ToUnderlying());
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_RIDE_NOT_FOUND);
return GameActions::Result(GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_RIDE_NOT_FOUND);
}
const bool isGhost = GetFlags() & GAME_COMMAND_FLAG_GHOST;
@ -138,10 +136,10 @@ GameActions::Result RideEntranceExitRemoveAction::Execute() const
else if (entranceElement == nullptr)
{
LOG_WARNING(
"Entrance not found. x = %d, y = %d, ride = %u, station = %d",
_loc.x, _loc.y, _rideIndex.ToUnderlying(), _stationNum);
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_ENTRANCE_ELEMENT_NOT_FOUND);
"Entrance not found. x = %d, y = %d, ride = %u, station = %d", _loc.x, _loc.y, _rideIndex.ToUnderlying(),
_stationNum);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_ENTRANCE_ELEMENT_NOT_FOUND);
}
auto res = GameActions::Result();

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

@ -35,15 +35,14 @@ GameActions::Result RideFreezeRatingAction::Query() const
if (ride == nullptr)
{
LOG_WARNING("Invalid game command, ride_id = %u", _rideIndex.ToUnderlying());
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_RIDE_NOT_FOUND);
return GameActions::Result(GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_RIDE_NOT_FOUND);
}
if (_value <= 0)
{
LOG_WARNING("Rating value must be positive", _rideIndex.ToUnderlying());
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE);
}
return GameActions::Result();

18
src/openrct2/actions/RideSetAppearanceAction.cpp
View File

@ -54,8 +54,7 @@ GameActions::Result RideSetAppearanceAction::Query() const
if (ride == nullptr)
{
LOG_WARNING("Invalid game command, ride_id = %u", _rideIndex.ToUnderlying());
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_RIDE_NOT_FOUND);
return GameActions::Result(GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_RIDE_NOT_FOUND);
}
switch (_type)
@ -66,8 +65,8 @@ GameActions::Result RideSetAppearanceAction::Query() const
if (_index >= std::size(ride->track_colour))
{
LOG_WARNING("Invalid game command, index %d out of bounds", _index);
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE);
}
break;
case RideSetAppearanceType::VehicleColourBody:
@ -76,8 +75,8 @@ GameActions::Result RideSetAppearanceAction::Query() const
if (_index >= std::size(ride->vehicle_colours))
{
LOG_WARNING("Invalid game command, index %d out of bounds", _index);
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE);
}
break;
case RideSetAppearanceType::VehicleColourScheme:
@ -86,8 +85,8 @@ GameActions::Result RideSetAppearanceAction::Query() const
break;
default:
LOG_WARNING("Invalid game command, type %d not recognised", _type);
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE);
}
return GameActions::Result();
@ -99,8 +98,7 @@ GameActions::Result RideSetAppearanceAction::Execute() const
if (ride == nullptr)
{
LOG_WARNING("Invalid game command, ride_id = %u", _rideIndex.ToUnderlying());
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_RIDE_NOT_FOUND);
return GameActions::Result(GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_RIDE_NOT_FOUND);
}
switch (_type)

14
src/openrct2/actions/RideSetPriceAction.cpp
View File

@ -55,16 +55,15 @@ GameActions::Result RideSetPriceAction::Query() const
if (ride == nullptr)
{
LOG_WARNING("Invalid game command, ride_id = %u", _rideIndex.ToUnderlying());
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_RIDE_NOT_FOUND);
return GameActions::Result(GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_RIDE_NOT_FOUND);
}
const auto* rideEntry = GetRideEntryByIndex(ride->subtype);
if (rideEntry == nullptr)
{
LOG_WARNING("Invalid game command for ride %u", _rideIndex.ToUnderlying());
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_RIDE_OBJECT_ENTRY_NOT_FOUND);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_RIDE_OBJECT_ENTRY_NOT_FOUND);
}
return res;
@ -79,16 +78,15 @@ GameActions::Result RideSetPriceAction::Execute() const
if (ride == nullptr)
{
LOG_WARNING("Invalid game command, ride_id = %u", _rideIndex.ToUnderlying());
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_RIDE_NOT_FOUND);
return GameActions::Result(GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_RIDE_NOT_FOUND);
}
const auto* rideEntry = GetRideEntryByIndex(ride->subtype);
if (rideEntry == nullptr)
{
LOG_WARNING("Invalid game command for ride %u", _rideIndex.ToUnderlying());
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_RIDE_OBJECT_ENTRY_NOT_FOUND);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_RIDE_OBJECT_ENTRY_NOT_FOUND);
}
if (!ride->overall_view.IsNull())

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

@ -40,8 +40,8 @@ GameActions::Result ScenarioSetSettingAction::Query() const
if (_setting >= ScenarioSetSetting::Count)
{
LOG_ERROR("Invalid setting: %u", _setting);
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE);
}
return GameActions::Result();
@ -266,8 +266,7 @@ GameActions::Result ScenarioSetSettingAction::Execute() const
default:
LOG_ERROR("Invalid setting: %u", _setting);
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);
}
WindowInvalidateByClass(WindowClass::EditorScenarioOptions);
return GameActions::Result();

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

@ -39,16 +39,14 @@ GameActions::Result StaffFireAction::Query() const
if (_spriteId.ToUnderlying() >= MAX_ENTITIES || _spriteId.IsNull())
{
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_STAFF_NOT_FOUND);
}
auto staff = TryGetEntity<Staff>(_spriteId);
if (staff == nullptr)
{
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_STAFF_NOT_FOUND);
}
if (staff->State == PeepState::Fixing)
@ -69,8 +67,7 @@ GameActions::Result StaffFireAction::Execute() const
if (staff == nullptr)
{
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_STAFF_NOT_FOUND);
}
WindowCloseByClass(WindowClass::FirePrompt);
PeepEntityRemove(staff);

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

@ -64,24 +64,22 @@ GameActions::Result StaffSetCostumeAction::Query() const
{
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_STAFF_NOT_FOUND);
}
auto* staff = TryGetEntity<Staff>(_spriteIndex);
if (staff == nullptr)
{
LOG_WARNING("Invalid game command for sprite %u", _spriteIndex);
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_STAFF_NOT_FOUND);
}
auto spriteType = EntertainerCostumeToSprite(_costume);
if (EnumValue(spriteType) > std::size(peep_slow_walking_types))
{
LOG_WARNING("Invalid game command for sprite %u", _spriteIndex);
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE);
}
return GameActions::Result();
}
@ -92,8 +90,7 @@ GameActions::Result StaffSetCostumeAction::Execute() const
if (staff == nullptr)
{
LOG_WARNING("Invalid game command for sprite %u", _spriteIndex);
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_STAFF_NOT_FOUND);
}
auto spriteType = EntertainerCostumeToSprite(_costume);

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

@ -45,8 +45,7 @@ GameActions::Result StaffSetOrdersAction::Query() const
{
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_STAFF_NOT_FOUND);
}
auto* staff = TryGetEntity<Staff>(_spriteIndex);
@ -66,8 +65,7 @@ GameActions::Result StaffSetOrdersAction::Execute() const
if (staff == nullptr)
{
LOG_WARNING("Invalid game command for sprite %u", _spriteIndex);
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_STAFF_NOT_FOUND);
}
staff->StaffOrders = _ordersId;

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

@ -61,8 +61,7 @@ GameActions::Result StaffSetPatrolAreaAction::QueryExecute(bool executing) const
if (staff == nullptr)
{
LOG_ERROR("Invalid entity ID: %u", _spriteId.ToUnderlying());
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_STAFF_NOT_FOUND);
}
auto validRange = ClampRangeWithinMap(_range);

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

@ -231,8 +231,8 @@ GameActions::Result TileModifyAction::QueryExecute(bool isExecuting) const
}
default:
LOG_ERROR("invalid instruction");
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE);
}
res.Position.x = _loc.x;

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

@ -64,8 +64,8 @@ GameActions::Result TrackSetBrakeSpeedAction::QueryExecute(bool isExecuting) con
if (tileElement == nullptr)
{
LOG_WARNING("Invalid game command for setting brakes speed. x = %d, y = %d", _loc.x, _loc.y);
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE);
}
if (isExecuting)

8
src/openrct2/actions/WaterSetHeightAction.cpp
View File

@ -74,8 +74,8 @@ GameActions::Result WaterSetHeightAction::Query() const
if (surfaceElement == nullptr)
{
LOG_ERROR("Could not find surface element at: x %u, y %u", _coords.x, _coords.y);
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_SURFACE_ELEMENT_NOT_FOUND);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_SURFACE_ELEMENT_NOT_FOUND);
}
int32_t zHigh = surfaceElement->GetBaseZ();
@ -120,8 +120,8 @@ GameActions::Result WaterSetHeightAction::Execute() const
if (surfaceElement == nullptr)
{
LOG_ERROR("Could not find surface element at: x %u, y %u", _coords.x, _coords.y);
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_SURFACE_ELEMENT_NOT_FOUND);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_SURFACE_ELEMENT_NOT_FOUND);
}
if (_height > surfaceElement->BaseHeight)

7
src/openrct2/network/NetworkBase.cpp
View File

@ -3705,8 +3705,8 @@ GameActions::Result NetworkModifyGroups(
break;
default:
LOG_ERROR("Invalid Modify Group Type: %u", static_cast<uint8_t>(type));
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE);
}
network.SaveGroups();
@ -3722,8 +3722,7 @@ GameActions::Result NetworkKickPlayer(NetworkPlayerId_t playerId, bool isExecuti
{
// Player might be already removed by the PLAYERLIST command, need to refactor non-game commands executing too
// early.
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_PLAYER_NOT_FOUND);
return GameActions::Result(GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_PLAYER_NOT_FOUND);
}
if (player->Flags & NETWORK_PLAYER_FLAG_ISSERVER)

9
src/openrct2/ride/TrackDesign.cpp
View File

@ -1370,8 +1370,8 @@ static std::optional<GameActions::Result> TrackDesignPlaceEntrances(
TileElement* tile_element = MapGetFirstElementAt(tile);
if (tile_element == nullptr)
{
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_TILE_ELEMENT_NOT_FOUND);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_TILE_ELEMENT_NOT_FOUND);
}
do
@ -1683,8 +1683,9 @@ static GameActions::Result TrackDesignPlaceRide(TrackDesignState& tds, TrackDesi
auto surfaceElement = MapGetSurfaceElementAt(tile);
if (surfaceElement == nullptr)
{
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_SURFACE_ELEMENT_NOT_FOUND);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER,
STR_ERR_SURFACE_ELEMENT_NOT_FOUND);
}
int32_t surfaceZ = surfaceElement->GetBaseZ();

116
src/openrct2/world/TileInspector.cpp
View File

@ -139,8 +139,8 @@ namespace OpenRCT2::TileInspector
{
TileElement* const tileElement = MapGetNthElementAt(loc, elementIndex);
if (tileElement == nullptr)
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_TILE_ELEMENT_NOT_FOUND);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_TILE_ELEMENT_NOT_FOUND);
if (isExecuting)
{
@ -203,8 +203,8 @@ namespace OpenRCT2::TileInspector
{
TileElement* const tileElement = MapGetNthElementAt(loc, elementIndex);
if (tileElement == nullptr)
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_TILE_ELEMENT_NOT_FOUND);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_TILE_ELEMENT_NOT_FOUND);
if (isExecuting)
{
@ -282,8 +282,8 @@ namespace OpenRCT2::TileInspector
{
TileElement* const tileElement = MapGetNthElementAt(loc, elementIndex);
if (tileElement == nullptr)
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_TILE_ELEMENT_NOT_FOUND);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_TILE_ELEMENT_NOT_FOUND);
if (!isExecuting)
{
@ -368,8 +368,8 @@ namespace OpenRCT2::TileInspector
{
const TileElement* const firstElement = MapGetFirstElementAt(loc);
if (firstElement == nullptr)
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_TILE_ELEMENT_NOT_FOUND);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_TILE_ELEMENT_NOT_FOUND);
// Count elements on tile
int32_t numElement = 0;
@ -444,8 +444,8 @@ namespace OpenRCT2::TileInspector
{
TileElement* const tileElement = MapGetNthElementAt(loc, elementIndex);
if (tileElement == nullptr)
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_TILE_ELEMENT_NOT_FOUND);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_TILE_ELEMENT_NOT_FOUND);
auto heightValidationResult = ValidateTileHeight(tileElement, heightOffset);
if (heightValidationResult.Error != GameActions::Status::Ok)
@ -490,8 +490,8 @@ namespace OpenRCT2::TileInspector
// No surface element on tile
if (surfaceelement == nullptr)
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_SURFACE_ELEMENT_NOT_FOUND);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_SURFACE_ELEMENT_NOT_FOUND);
if (isExecuting)
{
@ -510,8 +510,8 @@ namespace OpenRCT2::TileInspector
// No surface element on tile
if (surfaceElement == nullptr)
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_SURFACE_ELEMENT_NOT_FOUND);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_SURFACE_ELEMENT_NOT_FOUND);
if (isExecuting)
{
@ -557,8 +557,8 @@ namespace OpenRCT2::TileInspector
// No surface element on tile
if (surfaceElement == nullptr)
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_SURFACE_ELEMENT_NOT_FOUND);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_SURFACE_ELEMENT_NOT_FOUND);
if (isExecuting)
{
@ -573,8 +573,8 @@ namespace OpenRCT2::TileInspector
{
TileElement* const pathElement = MapGetNthElementAt(loc, elementIndex);
if (pathElement == nullptr || pathElement->GetType() != TileElementType::Path)
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_PATH_ELEMENT_NOT_FOUND);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_PATH_ELEMENT_NOT_FOUND);
if (isExecuting)
{
@ -589,8 +589,8 @@ namespace OpenRCT2::TileInspector
{
TileElement* const pathElement = MapGetNthElementAt(loc, elementIndex);
if (pathElement == nullptr || pathElement->GetType() != TileElementType::Path)
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_PATH_ELEMENT_NOT_FOUND);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_PATH_ELEMENT_NOT_FOUND);
if (isExecuting)
{
@ -604,8 +604,8 @@ namespace OpenRCT2::TileInspector
{
TileElement* const pathElement = MapGetNthElementAt(loc, elementIndex);
if (pathElement == nullptr || pathElement->GetType() != TileElementType::Path)
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_PATH_ELEMENT_NOT_FOUND);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_PATH_ELEMENT_NOT_FOUND);
if (isExecuting)
{
@ -619,8 +619,8 @@ namespace OpenRCT2::TileInspector
{
TileElement* const pathElement = MapGetNthElementAt(loc, elementIndex);
if (pathElement == nullptr || pathElement->GetType() != TileElementType::Path)
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_PATH_ELEMENT_NOT_FOUND);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_PATH_ELEMENT_NOT_FOUND);
if (isExecuting)
{
@ -635,13 +635,13 @@ namespace OpenRCT2::TileInspector
{
TileElement* const entranceElement = MapGetNthElementAt(loc, elementIndex);
if (entranceElement == nullptr || entranceElement->GetType() != TileElementType::Entrance)
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_ENTRANCE_ELEMENT_NOT_FOUND);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_ENTRANCE_ELEMENT_NOT_FOUND);
auto ride = GetRide(entranceElement->AsEntrance()->GetRideIndex());
if (ride == nullptr)
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_RIDE_NOT_FOUND);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_RIDE_NOT_FOUND);
if (isExecuting)
{
@ -666,8 +666,8 @@ namespace OpenRCT2::TileInspector
{
TileElement* const wallElement = MapGetNthElementAt(loc, elementIndex);
if (wallElement == nullptr || wallElement->GetType() != TileElementType::Wall)
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_WALL_ELEMENT_NOT_FOUND);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_WALL_ELEMENT_NOT_FOUND);
if (isExecuting)
{
@ -683,8 +683,8 @@ namespace OpenRCT2::TileInspector
{
TileElement* const wallElement = MapGetNthElementAt(loc, elementIndex);
if (wallElement == nullptr || wallElement->GetType() != TileElementType::Wall)
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_WALL_ELEMENT_NOT_FOUND);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_WALL_ELEMENT_NOT_FOUND);
if (isExecuting)
{
@ -704,8 +704,8 @@ namespace OpenRCT2::TileInspector
TileElement* const trackElement = MapGetNthElementAt(loc, elementIndex);
if (trackElement == nullptr || trackElement->GetType() != TileElementType::Track)
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_TRACK_ELEMENT_NOT_FOUND);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_TRACK_ELEMENT_NOT_FOUND);
if (isExecuting)
{
@ -717,14 +717,14 @@ namespace OpenRCT2::TileInspector
auto rideIndex = trackElement->AsTrack()->GetRideIndex();
auto ride = GetRide(rideIndex);
if (ride == nullptr)
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_RIDE_NOT_FOUND);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_RIDE_NOT_FOUND);
const auto& ted = GetTrackElementDescriptor(type);
const auto* trackBlock = ted.GetBlockForSequence(trackElement->AsTrack()->GetSequenceIndex());
if (trackBlock == nullptr)
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_TRACK_BLOCK_NOT_FOUND);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_TRACK_BLOCK_NOT_FOUND);
uint8_t originDirection = trackElement->GetDirection();
CoordsXY offsets = { trackBlock->x, trackBlock->y };
@ -747,8 +747,8 @@ namespace OpenRCT2::TileInspector
if (trackElement == nullptr)
{
LOG_ERROR("Track map element part not found!");
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_TRACK_ELEMENT_NOT_FOUND);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_TRACK_ELEMENT_NOT_FOUND);
}
// track_remove returns here on failure, not sure when this would ever be hit. Only thing I can think of is
@ -774,8 +774,8 @@ namespace OpenRCT2::TileInspector
{
TileElement* const trackElement = MapGetNthElementAt(loc, elementIndex);
if (trackElement == nullptr || trackElement->GetType() != TileElementType::Track)
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_TRACK_ELEMENT_NOT_FOUND);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_TRACK_ELEMENT_NOT_FOUND);
if (isExecuting)
{
@ -798,14 +798,14 @@ namespace OpenRCT2::TileInspector
auto rideIndex = trackElement->AsTrack()->GetRideIndex();
auto ride = GetRide(rideIndex);
if (ride == nullptr)
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_RIDE_NOT_FOUND);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_RIDE_NOT_FOUND);
const auto& ted = GetTrackElementDescriptor(type);
auto trackBlock = ted.GetBlockForSequence(trackElement->AsTrack()->GetSequenceIndex());
if (trackBlock == nullptr)
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_TRACK_BLOCK_NOT_FOUND);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_TRACK_BLOCK_NOT_FOUND);
uint8_t originDirection = trackElement->GetDirection();
CoordsXY offsets = { trackBlock->x, trackBlock->y };
@ -828,8 +828,8 @@ namespace OpenRCT2::TileInspector
if (trackElement == nullptr)
{
LOG_ERROR("Track map element part not found!");
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_TRACK_ELEMENT_NOT_FOUND);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_TRACK_ELEMENT_NOT_FOUND);
}
// track_remove returns here on failure, not sure when this would ever be hit. Only thing I can think of is
@ -853,8 +853,8 @@ namespace OpenRCT2::TileInspector
{
TileElement* const trackElement = MapGetNthElementAt(loc, elementIndex);
if (trackElement == nullptr || trackElement->GetType() != TileElementType::Track)
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_TRACK_ELEMENT_NOT_FOUND);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_TRACK_ELEMENT_NOT_FOUND);
if (isExecuting)
{
@ -869,8 +869,8 @@ namespace OpenRCT2::TileInspector
{
TileElement* const trackElement = MapGetNthElementAt(loc, elementIndex);
if (trackElement == nullptr || trackElement->GetType() != TileElementType::Track)
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_TRACK_ELEMENT_NOT_FOUND);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_TRACK_ELEMENT_NOT_FOUND);
if (isExecuting)
{
@ -885,8 +885,8 @@ namespace OpenRCT2::TileInspector
{
TileElement* const tileElement = MapGetNthElementAt(loc, elementIndex);
if (tileElement == nullptr || tileElement->GetType() != TileElementType::SmallScenery)
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_TILE_ELEMENT_NOT_FOUND);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_TILE_ELEMENT_NOT_FOUND);
if (isExecuting)
{
@ -905,8 +905,8 @@ namespace OpenRCT2::TileInspector
{
TileElement* const tileElement = MapGetNthElementAt(loc, elementIndex);
if (tileElement == nullptr || tileElement->GetType() != TileElementType::SmallScenery)
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_TILE_ELEMENT_NOT_FOUND);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_TILE_ELEMENT_NOT_FOUND);
if (isExecuting)
{
@ -922,8 +922,8 @@ namespace OpenRCT2::TileInspector
{
TileElement* const bannerElement = MapGetNthElementAt(loc, elementIndex);
if (bannerElement == nullptr || bannerElement->GetType() != TileElementType::Banner)
return GameActions::Result(GameActions::Status::InvalidParameters,
STR_ERR_INVALID_PARAMETER, STR_ERR_BANNER_ELEMENT_NOT_FOUND);
return GameActions::Result(
GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_BANNER_ELEMENT_NOT_FOUND);
if (isExecuting)
{