Add strings for value outside pre-defined range

src/openrct2/actions/CheatSetAction.cpp

@@ -72,18 +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_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>(_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;
     }

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;

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);
     }
 }

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();

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();
 }

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();

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();
 }

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();

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();

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();

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();
 }

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;

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)

src/openrct2/network/NetworkBase.cpp

@@ -3705,7 +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_NONE, STR_NONE);
+            return GameActions::Result(GameActions::Status::InvalidParameters,
+                STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE);
     }
 
     network.SaveGroups();