From 32c880ef890c6e3e19f5d4207c9d8969516feb40 Mon Sep 17 00:00:00 2001 From: Peter Froud Date: Mon, 22 Jan 2024 01:30:13 -0800 Subject: [PATCH] Add strings for value outside pre-defined range --- src/openrct2/actions/CheatSetAction.cpp | 12 ++++++++---- src/openrct2/actions/GameSetSpeedAction.cpp | 6 ++++-- src/openrct2/actions/LandSetRightsAction.cpp | 3 ++- src/openrct2/actions/ParkSetDateAction.cpp | 3 ++- src/openrct2/actions/ParkSetEntranceFeeAction.cpp | 3 ++- src/openrct2/actions/ParkSetParameterAction.cpp | 6 ++++-- .../actions/ParkSetResearchFundingAction.cpp | 3 ++- src/openrct2/actions/RideFreezeRatingAction.cpp | 3 ++- src/openrct2/actions/RideSetAppearanceAction.cpp | 9 ++++++--- src/openrct2/actions/ScenarioSetSettingAction.cpp | 7 +++++-- src/openrct2/actions/StaffSetCostumeAction.cpp | 3 ++- src/openrct2/actions/TileModifyAction.cpp | 3 ++- src/openrct2/actions/TrackSetBrakeSpeedAction.cpp | 3 ++- src/openrct2/network/NetworkBase.cpp | 3 ++- 14 files changed, 45 insertions(+), 22 deletions(-) diff --git a/src/openrct2/actions/CheatSetAction.cpp b/src/openrct2/actions/CheatSetAction.cpp index 679958f223..3839598b3c 100644 --- a/src/openrct2/actions/CheatSetAction.cpp +++ b/src/openrct2/actions/CheatSetAction.cpp @@ -72,18 +72,21 @@ GameActions::Result CheatSetAction::Query() const { if (static_cast(_cheatType) >= static_cast(CheatType::Count)) { - return GameActions::Result(GameActions::Status::InvalidParameters, STR_NONE, STR_NONE); + return GameActions::Result(GameActions::Status::InvalidParameters, + STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE); } ParametersRange validRange = GetParameterRange(static_cast(_cheatType.id)); if (_param1 < validRange.first.first || _param1 > validRange.first.second) { - return GameActions::Result(GameActions::Status::InvalidParameters, STR_NONE, STR_NONE); + 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_NONE, STR_NONE); + return GameActions::Result(GameActions::Status::InvalidParameters, + STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE); } return GameActions::Result(); @@ -256,7 +259,8 @@ GameActions::Result CheatSetAction::Execute() const default: { LOG_ERROR("Unabled cheat: %d", _cheatType.id); - GameActions::Result(GameActions::Status::InvalidParameters, STR_NONE, STR_NONE); + return GameActions::Result(GameActions::Status::InvalidParameters, + STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE); } break; } diff --git a/src/openrct2/actions/GameSetSpeedAction.cpp b/src/openrct2/actions/GameSetSpeedAction.cpp index 5a646e740b..7dd5fe2b78 100644 --- a/src/openrct2/actions/GameSetSpeedAction.cpp +++ b/src/openrct2/actions/GameSetSpeedAction.cpp @@ -40,7 +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_NONE, STR_NONE); + return GameActions::Result(GameActions::Status::InvalidParameters, + STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE); } return res; @@ -53,7 +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_NONE, STR_NONE); + return GameActions::Result(GameActions::Status::InvalidParameters, + STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE); } gGameSpeed = _speed; diff --git a/src/openrct2/actions/LandSetRightsAction.cpp b/src/openrct2/actions/LandSetRightsAction.cpp index 167876f4cc..5eba026928 100644 --- a/src/openrct2/actions/LandSetRightsAction.cpp +++ b/src/openrct2/actions/LandSetRightsAction.cpp @@ -204,6 +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_NONE, STR_NONE); + return GameActions::Result(GameActions::Status::InvalidParameters, + STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE); } } diff --git a/src/openrct2/actions/ParkSetDateAction.cpp b/src/openrct2/actions/ParkSetDateAction.cpp index d0ff71d4b8..67820e0cee 100644 --- a/src/openrct2/actions/ParkSetDateAction.cpp +++ b/src/openrct2/actions/ParkSetDateAction.cpp @@ -47,7 +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_NONE, STR_NONE); + return GameActions::Result(GameActions::Status::InvalidParameters, + STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE); } return GameActions::Result(); diff --git a/src/openrct2/actions/ParkSetEntranceFeeAction.cpp b/src/openrct2/actions/ParkSetEntranceFeeAction.cpp index 72d16aefea..7455ae94c7 100644 --- a/src/openrct2/actions/ParkSetEntranceFeeAction.cpp +++ b/src/openrct2/actions/ParkSetEntranceFeeAction.cpp @@ -47,7 +47,8 @@ GameActions::Result ParkSetEntranceFeeAction::Query() const } if (_fee < 0.00_GBP || _fee > MAX_ENTRANCE_FEE) { - return GameActions::Result(GameActions::Status::InvalidParameters, STR_NONE, STR_NONE); + return GameActions::Result(GameActions::Status::InvalidParameters, + STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE); } return GameActions::Result(); } diff --git a/src/openrct2/actions/ParkSetParameterAction.cpp b/src/openrct2/actions/ParkSetParameterAction.cpp index 06752e8f87..a6d09f3214 100644 --- a/src/openrct2/actions/ParkSetParameterAction.cpp +++ b/src/openrct2/actions/ParkSetParameterAction.cpp @@ -41,7 +41,8 @@ GameActions::Result ParkSetParameterAction::Query() const { if (_parameter >= ParkParameter::Count) { - return GameActions::Result(GameActions::Status::InvalidParameters, STR_NONE, STR_NONE); + return GameActions::Result(GameActions::Status::InvalidParameters, + STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE); } auto res = GameActions::Result(); @@ -72,7 +73,8 @@ GameActions::Result ParkSetParameterAction::Execute() const WindowInvalidateByClass(WindowClass::Ride); break; default: - return GameActions::Result(GameActions::Status::InvalidParameters, STR_NONE, STR_NONE); + return GameActions::Result(GameActions::Status::InvalidParameters, + STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE); } auto res = GameActions::Result(); diff --git a/src/openrct2/actions/ParkSetResearchFundingAction.cpp b/src/openrct2/actions/ParkSetResearchFundingAction.cpp index b2e5bd055a..5c0fbb8fab 100644 --- a/src/openrct2/actions/ParkSetResearchFundingAction.cpp +++ b/src/openrct2/actions/ParkSetResearchFundingAction.cpp @@ -44,7 +44,8 @@ GameActions::Result ParkSetResearchFundingAction::Query() const { if (_fundingAmount >= RESEARCH_FUNDING_COUNT) { - return GameActions::Result(GameActions::Status::InvalidParameters, STR_NONE, STR_NONE); + return GameActions::Result(GameActions::Status::InvalidParameters, + STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE); } return GameActions::Result(); } diff --git a/src/openrct2/actions/RideFreezeRatingAction.cpp b/src/openrct2/actions/RideFreezeRatingAction.cpp index c0d9fbc790..b97f1de56c 100644 --- a/src/openrct2/actions/RideFreezeRatingAction.cpp +++ b/src/openrct2/actions/RideFreezeRatingAction.cpp @@ -42,7 +42,8 @@ GameActions::Result RideFreezeRatingAction::Query() const if (_value <= 0) { LOG_WARNING("Rating value must be positive", _rideIndex.ToUnderlying()); - return GameActions::Result(GameActions::Status::InvalidParameters, STR_NONE, STR_NONE); + return GameActions::Result(GameActions::Status::InvalidParameters, + STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE); } return GameActions::Result(); diff --git a/src/openrct2/actions/RideSetAppearanceAction.cpp b/src/openrct2/actions/RideSetAppearanceAction.cpp index 667e8d629e..027b9489e5 100644 --- a/src/openrct2/actions/RideSetAppearanceAction.cpp +++ b/src/openrct2/actions/RideSetAppearanceAction.cpp @@ -66,7 +66,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_NONE, STR_NONE); + return GameActions::Result(GameActions::Status::InvalidParameters, + STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE); } break; case RideSetAppearanceType::VehicleColourBody: @@ -75,7 +76,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_NONE, STR_NONE); + return GameActions::Result(GameActions::Status::InvalidParameters, + STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE); } break; case RideSetAppearanceType::VehicleColourScheme: @@ -84,7 +86,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_NONE, STR_NONE); + return GameActions::Result(GameActions::Status::InvalidParameters, + STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE); } return GameActions::Result(); diff --git a/src/openrct2/actions/ScenarioSetSettingAction.cpp b/src/openrct2/actions/ScenarioSetSettingAction.cpp index e7b4a9d06a..723acf4597 100644 --- a/src/openrct2/actions/ScenarioSetSettingAction.cpp +++ b/src/openrct2/actions/ScenarioSetSettingAction.cpp @@ -40,7 +40,8 @@ GameActions::Result ScenarioSetSettingAction::Query() const if (_setting >= ScenarioSetSetting::Count) { LOG_ERROR("Invalid setting: %u", _setting); - return GameActions::Result(GameActions::Status::InvalidParameters, STR_NONE, STR_NONE); + return GameActions::Result(GameActions::Status::InvalidParameters, + STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE); } return GameActions::Result(); @@ -264,7 +265,9 @@ GameActions::Result ScenarioSetSettingAction::Execute() const } default: LOG_ERROR("Invalid setting: %u", _setting); - return GameActions::Result(GameActions::Status::InvalidParameters, STR_NONE, STR_NONE); + return GameActions::Result( + GameActions::Status::InvalidParameters, + STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE); } WindowInvalidateByClass(WindowClass::EditorScenarioOptions); return GameActions::Result(); diff --git a/src/openrct2/actions/StaffSetCostumeAction.cpp b/src/openrct2/actions/StaffSetCostumeAction.cpp index b49b118a2b..c0aeadaf15 100644 --- a/src/openrct2/actions/StaffSetCostumeAction.cpp +++ b/src/openrct2/actions/StaffSetCostumeAction.cpp @@ -80,7 +80,8 @@ GameActions::Result StaffSetCostumeAction::Query() const 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_NONE, STR_NONE); + return GameActions::Result(GameActions::Status::InvalidParameters, + STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE); } return GameActions::Result(); } diff --git a/src/openrct2/actions/TileModifyAction.cpp b/src/openrct2/actions/TileModifyAction.cpp index d41e942ca1..b13cf99202 100644 --- a/src/openrct2/actions/TileModifyAction.cpp +++ b/src/openrct2/actions/TileModifyAction.cpp @@ -231,7 +231,8 @@ GameActions::Result TileModifyAction::QueryExecute(bool isExecuting) const } default: LOG_ERROR("invalid instruction"); - return GameActions::Result(GameActions::Status::InvalidParameters, STR_NONE, STR_NONE); + return GameActions::Result(GameActions::Status::InvalidParameters, + STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE); } res.Position.x = _loc.x; diff --git a/src/openrct2/actions/TrackSetBrakeSpeedAction.cpp b/src/openrct2/actions/TrackSetBrakeSpeedAction.cpp index 4e97750c8d..86af1f9ef1 100644 --- a/src/openrct2/actions/TrackSetBrakeSpeedAction.cpp +++ b/src/openrct2/actions/TrackSetBrakeSpeedAction.cpp @@ -64,7 +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_NONE, STR_NONE); + return GameActions::Result(GameActions::Status::InvalidParameters, + STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE); } if (isExecuting) diff --git a/src/openrct2/network/NetworkBase.cpp b/src/openrct2/network/NetworkBase.cpp index 20805cceb0..28d5c0112d 100644 --- a/src/openrct2/network/NetworkBase.cpp +++ b/src/openrct2/network/NetworkBase.cpp @@ -3705,7 +3705,8 @@ GameActions::Result NetworkModifyGroups( break; default: LOG_ERROR("Invalid Modify Group Type: %u", static_cast(type)); - return GameActions::Result(GameActions::Status::InvalidParameters, STR_NONE, STR_NONE); + return GameActions::Result(GameActions::Status::InvalidParameters, + STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE); } network.SaveGroups();