From 9299a80a58423f7286998e36db0a5cefd607080d Mon Sep 17 00:00:00 2001
From: Peter Froud <pfroud@gmail.com>
Date: Mon, 22 Jan 2024 01:19:28 -0800
Subject: [PATCH 01/13] Add descriptive error strings for null checks

---
 src/openrct2/actions/BalloonPressAction.cpp   |   6 +-
 src/openrct2/actions/LandSetHeightAction.cpp  |   6 +-
 src/openrct2/actions/LandSetRightsAction.cpp  |   3 +-
 .../actions/RideEntranceExitRemoveAction.cpp  |  22 ++--
 .../actions/RideFreezeRatingAction.cpp        |   3 +-
 .../actions/RideSetAppearanceAction.cpp       |   6 +-
 src/openrct2/actions/RideSetPriceAction.cpp   |  12 +-
 src/openrct2/actions/StaffFireAction.cpp      |   9 +-
 .../actions/StaffSetCostumeAction.cpp         |   9 +-
 src/openrct2/actions/StaffSetOrdersAction.cpp |   6 +-
 .../actions/StaffSetPatrolAreaAction.cpp      |   3 +-
 src/openrct2/actions/WaterSetHeightAction.cpp |   6 +-
 src/openrct2/network/NetworkBase.cpp          |   3 +-
 src/openrct2/ride/TrackDesign.cpp             |   6 +-
 src/openrct2/world/TileInspector.cpp          | 103 +++++++++++-------
 15 files changed, 131 insertions(+), 72 deletions(-)

diff --git a/src/openrct2/actions/BalloonPressAction.cpp b/src/openrct2/actions/BalloonPressAction.cpp
index 2887d852e9..91517fed4d 100644
--- a/src/openrct2/actions/BalloonPressAction.cpp
+++ b/src/openrct2/actions/BalloonPressAction.cpp
@@ -40,7 +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_NONE, STR_NONE);
+        return GameActions::Result(GameActions::Status::InvalidParameters,
+            STR_ERR_INVALID_PARAMETER, STR_ERR_BALLOON_NOT_FOUND);
     }
     return GameActions::Result();
 }
@@ -51,7 +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_NONE, STR_NONE);
+        return GameActions::Result(GameActions::Status::InvalidParameters,
+            STR_ERR_INVALID_PARAMETER, STR_ERR_BALLOON_NOT_FOUND);
     }
 
     balloon->Press();
diff --git a/src/openrct2/actions/LandSetHeightAction.cpp b/src/openrct2/actions/LandSetHeightAction.cpp
index ba21e618b4..848fba6068 100644
--- a/src/openrct2/actions/LandSetHeightAction.cpp
+++ b/src/openrct2/actions/LandSetHeightAction.cpp
@@ -102,7 +102,8 @@ GameActions::Result LandSetHeightAction::Query() const
 
     auto* surfaceElement = MapGetSurfaceElementAt(_coords);
     if (surfaceElement == nullptr)
-        return GameActions::Result(GameActions::Status::Unknown, STR_NONE, STR_NONE);
+        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.
@@ -163,7 +164,8 @@ GameActions::Result LandSetHeightAction::Execute() const
 
     auto* surfaceElement = MapGetSurfaceElementAt(_coords);
     if (surfaceElement == nullptr)
-        return GameActions::Result(GameActions::Status::Unknown, STR_NONE, STR_NONE);
+        return GameActions::Result(GameActions::Status::InvalidParameters,
+            STR_ERR_INVALID_PARAMETER, STR_ERR_SURFACE_ELEMENT_NOT_FOUND);
 
     cost += GetSurfaceHeightChangeCost(surfaceElement);
     SetSurfaceHeight(reinterpret_cast<TileElement*>(surfaceElement));
diff --git a/src/openrct2/actions/LandSetRightsAction.cpp b/src/openrct2/actions/LandSetRightsAction.cpp
index 8379ca5e55..167876f4cc 100644
--- a/src/openrct2/actions/LandSetRightsAction.cpp
+++ b/src/openrct2/actions/LandSetRightsAction.cpp
@@ -116,7 +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_NONE, STR_NONE);
+        return GameActions::Result(GameActions::Status::InvalidParameters,
+            STR_ERR_INVALID_PARAMETER, STR_ERR_SURFACE_ELEMENT_NOT_FOUND);
     }
 
     auto res = GameActions::Result();
diff --git a/src/openrct2/actions/RideEntranceExitRemoveAction.cpp b/src/openrct2/actions/RideEntranceExitRemoveAction.cpp
index 4720b94cfc..3522c5a3df 100644
--- a/src/openrct2/actions/RideEntranceExitRemoveAction.cpp
+++ b/src/openrct2/actions/RideEntranceExitRemoveAction.cpp
@@ -70,7 +70,8 @@ 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_NONE, STR_NONE);
+        return GameActions::Result(GameActions::Status::InvalidParameters,
+            STR_ERR_INVALID_PARAMETER, STR_ERR_RIDE_NOT_FOUND);
     }
 
     if (ride->status != RideStatus::Closed && ride->status != RideStatus::Simulating)
@@ -94,14 +95,15 @@ GameActions::Result RideEntranceExitRemoveAction::Query() const
     // If we are trying to remove a ghost and the element we found is real, return an error, but don't log a warning
     if (entranceElement != nullptr && (GetFlags() & GAME_COMMAND_FLAG_GHOST) && !(entranceElement->IsGhost()))
     {
-        return GameActions::Result(GameActions::Status::InvalidParameters, STR_NONE, STR_NONE);
+        return GameActions::Result(GameActions::Status::InvalidParameters, STR_ERR_GHOST_NOT_FOUND, STR_NONE);
     }
     else if (entranceElement == nullptr)
     {
         LOG_WARNING(
-            "Track Element not found. x = %d, y = %d, ride = %u, station = %u", _loc.x, _loc.y, _rideIndex.ToUnderlying(),
+            "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_NONE, STR_NONE);
+        return GameActions::Result(GameActions::Status::InvalidParameters,
+            STR_ERR_INVALID_PARAMETER, STR_ERR_ENTRANCE_ELEMENT_NOT_FOUND);
     }
 
     return GameActions::Result();
@@ -113,7 +115,8 @@ 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_NONE, STR_NONE);
+        return GameActions::Result(GameActions::Status::InvalidParameters,
+            STR_ERR_INVALID_PARAMETER, STR_ERR_RIDE_NOT_FOUND);
     }
 
     const bool isGhost = GetFlags() & GAME_COMMAND_FLAG_GHOST;
@@ -130,14 +133,15 @@ GameActions::Result RideEntranceExitRemoveAction::Execute() const
     // If we are trying to remove a ghost and the element we found is real, return an error, but don't log a warning
     if (entranceElement != nullptr && isGhost && !(entranceElement->IsGhost()))
     {
-        return GameActions::Result(GameActions::Status::InvalidParameters, STR_NONE, STR_NONE);
+        return GameActions::Result(GameActions::Status::InvalidParameters, STR_ERR_GHOST_NOT_FOUND, STR_NONE);
     }
     else if (entranceElement == nullptr)
     {
         LOG_WARNING(
-            "Track Element not found. x = %d, y = %d, ride = %u, station = %d", _loc.x, _loc.y, _rideIndex.ToUnderlying(),
-            _stationNum);
-        return GameActions::Result(GameActions::Status::InvalidParameters, STR_NONE, STR_NONE);
+            "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();
diff --git a/src/openrct2/actions/RideFreezeRatingAction.cpp b/src/openrct2/actions/RideFreezeRatingAction.cpp
index 22e741b7c0..c0d9fbc790 100644
--- a/src/openrct2/actions/RideFreezeRatingAction.cpp
+++ b/src/openrct2/actions/RideFreezeRatingAction.cpp
@@ -35,7 +35,8 @@ 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_NONE, STR_NONE);
+        return GameActions::Result(GameActions::Status::InvalidParameters,
+            STR_ERR_INVALID_PARAMETER, STR_ERR_RIDE_NOT_FOUND);
     }
 
     if (_value <= 0)
diff --git a/src/openrct2/actions/RideSetAppearanceAction.cpp b/src/openrct2/actions/RideSetAppearanceAction.cpp
index 4409158e11..667e8d629e 100644
--- a/src/openrct2/actions/RideSetAppearanceAction.cpp
+++ b/src/openrct2/actions/RideSetAppearanceAction.cpp
@@ -54,7 +54,8 @@ 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_NONE, STR_NONE);
+        return GameActions::Result(GameActions::Status::InvalidParameters,
+            STR_ERR_INVALID_PARAMETER, STR_ERR_RIDE_NOT_FOUND);
     }
 
     switch (_type)
@@ -95,7 +96,8 @@ 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_NONE, STR_NONE);
+        return GameActions::Result(GameActions::Status::InvalidParameters,
+            STR_ERR_INVALID_PARAMETER, STR_ERR_RIDE_NOT_FOUND);
     }
 
     switch (_type)
diff --git a/src/openrct2/actions/RideSetPriceAction.cpp b/src/openrct2/actions/RideSetPriceAction.cpp
index a7bc361ff4..6e6eb6e774 100644
--- a/src/openrct2/actions/RideSetPriceAction.cpp
+++ b/src/openrct2/actions/RideSetPriceAction.cpp
@@ -55,14 +55,16 @@ 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_NONE, STR_NONE);
+        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_NONE, STR_NONE);
+        return GameActions::Result(GameActions::Status::InvalidParameters,
+            STR_ERR_INVALID_PARAMETER, STR_ERR_RIDE_OBJECT_ENTRY_NOT_FOUND);
     }
 
     return res;
@@ -77,14 +79,16 @@ 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_NONE, STR_NONE);
+        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_NONE, STR_NONE);
+        return GameActions::Result(GameActions::Status::InvalidParameters,
+            STR_ERR_INVALID_PARAMETER, STR_ERR_RIDE_OBJECT_ENTRY_NOT_FOUND);
     }
 
     if (!ride->overall_view.IsNull())
diff --git a/src/openrct2/actions/StaffFireAction.cpp b/src/openrct2/actions/StaffFireAction.cpp
index 591cb658d0..7524c9c6e3 100644
--- a/src/openrct2/actions/StaffFireAction.cpp
+++ b/src/openrct2/actions/StaffFireAction.cpp
@@ -39,14 +39,16 @@ 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_NONE, STR_NONE);
+        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_NONE, STR_NONE);
+        return GameActions::Result(GameActions::Status::InvalidParameters,
+            STR_ERR_INVALID_PARAMETER, STR_ERR_STAFF_NOT_FOUND);
     }
 
     if (staff->State == PeepState::Fixing)
@@ -67,7 +69,8 @@ GameActions::Result StaffFireAction::Execute() const
     if (staff == nullptr)
     {
         LOG_ERROR("Invalid spriteId. spriteId = %u", _spriteId);
-        return GameActions::Result(GameActions::Status::InvalidParameters, STR_NONE, STR_NONE);
+        return GameActions::Result(GameActions::Status::InvalidParameters,
+            STR_ERR_INVALID_PARAMETER, STR_ERR_STAFF_NOT_FOUND);
     }
     WindowCloseByClass(WindowClass::FirePrompt);
     PeepEntityRemove(staff);
diff --git a/src/openrct2/actions/StaffSetCostumeAction.cpp b/src/openrct2/actions/StaffSetCostumeAction.cpp
index 2fb0ca3509..b49b118a2b 100644
--- a/src/openrct2/actions/StaffSetCostumeAction.cpp
+++ b/src/openrct2/actions/StaffSetCostumeAction.cpp
@@ -64,14 +64,16 @@ GameActions::Result StaffSetCostumeAction::Query() const
 {
     if (_spriteIndex.ToUnderlying() >= MAX_ENTITIES || _spriteIndex.IsNull())
     {
-        return GameActions::Result(GameActions::Status::InvalidParameters, STR_NONE, STR_NONE);
+        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_NONE, STR_NONE);
+        return GameActions::Result(GameActions::Status::InvalidParameters,
+            STR_ERR_INVALID_PARAMETER, STR_ERR_STAFF_NOT_FOUND);
     }
 
     auto spriteType = EntertainerCostumeToSprite(_costume);
@@ -89,7 +91,8 @@ GameActions::Result StaffSetCostumeAction::Execute() const
     if (staff == nullptr)
     {
         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_STAFF_NOT_FOUND);
     }
 
     auto spriteType = EntertainerCostumeToSprite(_costume);
diff --git a/src/openrct2/actions/StaffSetOrdersAction.cpp b/src/openrct2/actions/StaffSetOrdersAction.cpp
index 9ff23b3bc5..f2c3f1fcf0 100644
--- a/src/openrct2/actions/StaffSetOrdersAction.cpp
+++ b/src/openrct2/actions/StaffSetOrdersAction.cpp
@@ -45,7 +45,8 @@ GameActions::Result StaffSetOrdersAction::Query() const
 {
     if (_spriteIndex.ToUnderlying() >= MAX_ENTITIES || _spriteIndex.IsNull())
     {
-        return GameActions::Result(GameActions::Status::InvalidParameters, STR_NONE, STR_NONE);
+        return GameActions::Result(GameActions::Status::InvalidParameters,
+            STR_ERR_INVALID_PARAMETER, STR_ERR_STAFF_NOT_FOUND);
     }
 
     auto* staff = TryGetEntity<Staff>(_spriteIndex);
@@ -65,7 +66,8 @@ GameActions::Result StaffSetOrdersAction::Execute() const
     if (staff == nullptr)
     {
         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_STAFF_NOT_FOUND);
     }
     staff->StaffOrders = _ordersId;
 
diff --git a/src/openrct2/actions/StaffSetPatrolAreaAction.cpp b/src/openrct2/actions/StaffSetPatrolAreaAction.cpp
index c2f75926f0..740d0a2ccd 100644
--- a/src/openrct2/actions/StaffSetPatrolAreaAction.cpp
+++ b/src/openrct2/actions/StaffSetPatrolAreaAction.cpp
@@ -61,7 +61,8 @@ 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_NONE, STR_NONE);
+        return GameActions::Result(GameActions::Status::InvalidParameters,
+            STR_ERR_INVALID_PARAMETER, STR_ERR_STAFF_NOT_FOUND);
     }
 
     auto validRange = ClampRangeWithinMap(_range);
diff --git a/src/openrct2/actions/WaterSetHeightAction.cpp b/src/openrct2/actions/WaterSetHeightAction.cpp
index 804bc12e66..8e27d18b6b 100644
--- a/src/openrct2/actions/WaterSetHeightAction.cpp
+++ b/src/openrct2/actions/WaterSetHeightAction.cpp
@@ -74,7 +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::Unknown, STR_NONE, STR_NONE);
+        return GameActions::Result(GameActions::Status::InvalidParameters,
+            STR_ERR_INVALID_PARAMETER, STR_ERR_SURFACE_ELEMENT_NOT_FOUND);
     }
 
     int32_t zHigh = surfaceElement->GetBaseZ();
@@ -119,7 +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::Unknown, STR_NONE, STR_NONE);
+        return GameActions::Result(GameActions::Status::InvalidParameters,
+            STR_ERR_INVALID_PARAMETER, STR_ERR_SURFACE_ELEMENT_NOT_FOUND);
     }
 
     if (_height > surfaceElement->BaseHeight)
diff --git a/src/openrct2/network/NetworkBase.cpp b/src/openrct2/network/NetworkBase.cpp
index cda2c836a1..20805cceb0 100644
--- a/src/openrct2/network/NetworkBase.cpp
+++ b/src/openrct2/network/NetworkBase.cpp
@@ -3721,7 +3721,8 @@ 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::Unknown, STR_NONE, STR_NONE);
+        return GameActions::Result(GameActions::Status::InvalidParameters,
+            STR_ERR_INVALID_PARAMETER, STR_ERR_PLAYER_NOT_FOUND);
     }
 
     if (player->Flags & NETWORK_PLAYER_FLAG_ISSERVER)
diff --git a/src/openrct2/ride/TrackDesign.cpp b/src/openrct2/ride/TrackDesign.cpp
index 17ce50c916..5239bf2bde 100644
--- a/src/openrct2/ride/TrackDesign.cpp
+++ b/src/openrct2/ride/TrackDesign.cpp
@@ -1370,7 +1370,8 @@ static std::optional<GameActions::Result> TrackDesignPlaceEntrances(
                     TileElement* tile_element = MapGetFirstElementAt(tile);
                     if (tile_element == nullptr)
                     {
-                        return GameActions::Result(GameActions::Status::InvalidParameters, STR_NONE, STR_NONE);
+                        return GameActions::Result(GameActions::Status::InvalidParameters,
+                            STR_ERR_INVALID_PARAMETER, STR_ERR_TILE_ELEMENT_NOT_FOUND);
                     }
 
                     do
@@ -1682,7 +1683,8 @@ static GameActions::Result TrackDesignPlaceRide(TrackDesignState& tds, TrackDesi
                     auto surfaceElement = MapGetSurfaceElementAt(tile);
                     if (surfaceElement == nullptr)
                     {
-                        return GameActions::Result(GameActions::Status::InvalidParameters, STR_NONE, STR_NONE);
+                        return GameActions::Result(GameActions::Status::InvalidParameters,
+                            STR_ERR_INVALID_PARAMETER, STR_ERR_SURFACE_ELEMENT_NOT_FOUND);
                     }
 
                     int32_t surfaceZ = surfaceElement->GetBaseZ();
diff --git a/src/openrct2/world/TileInspector.cpp b/src/openrct2/world/TileInspector.cpp
index 70bcb2c2bf..cddd0fe14a 100644
--- a/src/openrct2/world/TileInspector.cpp
+++ b/src/openrct2/world/TileInspector.cpp
@@ -139,7 +139,8 @@ namespace OpenRCT2::TileInspector
     {
         TileElement* const tileElement = MapGetNthElementAt(loc, elementIndex);
         if (tileElement == nullptr)
-            return GameActions::Result(GameActions::Status::Unknown, STR_NONE, STR_NONE);
+            return GameActions::Result(GameActions::Status::InvalidParameters,
+                STR_ERR_INVALID_PARAMETER, STR_ERR_TILE_ELEMENT_NOT_FOUND);
 
         if (isExecuting)
         {
@@ -202,7 +203,8 @@ namespace OpenRCT2::TileInspector
     {
         TileElement* const tileElement = MapGetNthElementAt(loc, elementIndex);
         if (tileElement == nullptr)
-            return GameActions::Result(GameActions::Status::Unknown, STR_NONE, STR_NONE);
+            return GameActions::Result(GameActions::Status::InvalidParameters,
+                STR_ERR_INVALID_PARAMETER, STR_ERR_TILE_ELEMENT_NOT_FOUND);
 
         if (isExecuting)
         {
@@ -280,7 +282,8 @@ namespace OpenRCT2::TileInspector
     {
         TileElement* const tileElement = MapGetNthElementAt(loc, elementIndex);
         if (tileElement == nullptr)
-            return GameActions::Result(GameActions::Status::Unknown, STR_NONE, STR_NONE);
+            return GameActions::Result(GameActions::Status::InvalidParameters,
+                STR_ERR_INVALID_PARAMETER, STR_ERR_TILE_ELEMENT_NOT_FOUND);
 
         if (!isExecuting)
         {
@@ -365,7 +368,8 @@ namespace OpenRCT2::TileInspector
         {
             const TileElement* const firstElement = MapGetFirstElementAt(loc);
             if (firstElement == nullptr)
-                return GameActions::Result(GameActions::Status::Unknown, STR_NONE, STR_NONE);
+                return GameActions::Result(GameActions::Status::InvalidParameters,
+                    STR_ERR_INVALID_PARAMETER, STR_ERR_TILE_ELEMENT_NOT_FOUND);
 
             // Count elements on tile
             int32_t numElement = 0;
@@ -440,7 +444,8 @@ namespace OpenRCT2::TileInspector
     {
         TileElement* const tileElement = MapGetNthElementAt(loc, elementIndex);
         if (tileElement == nullptr)
-            return GameActions::Result(GameActions::Status::Unknown, STR_NONE, STR_NONE);
+            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)
@@ -485,7 +490,8 @@ namespace OpenRCT2::TileInspector
 
         // No surface element on tile
         if (surfaceelement == nullptr)
-            return GameActions::Result(GameActions::Status::Unknown, STR_NONE, STR_NONE);
+            return GameActions::Result(GameActions::Status::InvalidParameters,
+                STR_ERR_INVALID_PARAMETER, STR_ERR_SURFACE_ELEMENT_NOT_FOUND);
 
         if (isExecuting)
         {
@@ -504,7 +510,8 @@ namespace OpenRCT2::TileInspector
 
         // No surface element on tile
         if (surfaceElement == nullptr)
-            return GameActions::Result(GameActions::Status::Unknown, STR_NONE, STR_NONE);
+            return GameActions::Result(GameActions::Status::InvalidParameters,
+                STR_ERR_INVALID_PARAMETER, STR_ERR_SURFACE_ELEMENT_NOT_FOUND);
 
         if (isExecuting)
         {
@@ -550,7 +557,8 @@ namespace OpenRCT2::TileInspector
 
         // No surface element on tile
         if (surfaceElement == nullptr)
-            return GameActions::Result(GameActions::Status::Unknown, STR_NONE, STR_NONE);
+            return GameActions::Result(GameActions::Status::InvalidParameters,
+                STR_ERR_INVALID_PARAMETER, STR_ERR_SURFACE_ELEMENT_NOT_FOUND);
 
         if (isExecuting)
         {
@@ -565,7 +573,8 @@ namespace OpenRCT2::TileInspector
     {
         TileElement* const pathElement = MapGetNthElementAt(loc, elementIndex);
         if (pathElement == nullptr || pathElement->GetType() != TileElementType::Path)
-            return GameActions::Result(GameActions::Status::Unknown, STR_NONE, STR_NONE);
+            return GameActions::Result(GameActions::Status::InvalidParameters,
+                STR_ERR_INVALID_PARAMETER, STR_ERR_PATH_ELEMENT_NOT_FOUND);
 
         if (isExecuting)
         {
@@ -580,7 +589,8 @@ namespace OpenRCT2::TileInspector
     {
         TileElement* const pathElement = MapGetNthElementAt(loc, elementIndex);
         if (pathElement == nullptr || pathElement->GetType() != TileElementType::Path)
-            return GameActions::Result(GameActions::Status::Unknown, STR_NONE, STR_NONE);
+            return GameActions::Result(GameActions::Status::InvalidParameters,
+                STR_ERR_INVALID_PARAMETER, STR_ERR_PATH_ELEMENT_NOT_FOUND);
 
         if (isExecuting)
         {
@@ -594,7 +604,8 @@ namespace OpenRCT2::TileInspector
     {
         TileElement* const pathElement = MapGetNthElementAt(loc, elementIndex);
         if (pathElement == nullptr || pathElement->GetType() != TileElementType::Path)
-            return GameActions::Result(GameActions::Status::Unknown, STR_NONE, STR_NONE);
+            return GameActions::Result(GameActions::Status::InvalidParameters,
+                STR_ERR_INVALID_PARAMETER, STR_ERR_PATH_ELEMENT_NOT_FOUND);
 
         if (isExecuting)
         {
@@ -608,7 +619,8 @@ namespace OpenRCT2::TileInspector
     {
         TileElement* const pathElement = MapGetNthElementAt(loc, elementIndex);
         if (pathElement == nullptr || pathElement->GetType() != TileElementType::Path)
-            return GameActions::Result(GameActions::Status::Unknown, STR_NONE, STR_NONE);
+            return GameActions::Result(GameActions::Status::InvalidParameters,
+                STR_ERR_INVALID_PARAMETER, STR_ERR_PATH_ELEMENT_NOT_FOUND);
 
         if (isExecuting)
         {
@@ -623,11 +635,13 @@ namespace OpenRCT2::TileInspector
     {
         TileElement* const entranceElement = MapGetNthElementAt(loc, elementIndex);
         if (entranceElement == nullptr || entranceElement->GetType() != TileElementType::Entrance)
-            return GameActions::Result(GameActions::Status::Unknown, STR_NONE, STR_NONE);
+            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::Unknown, STR_NONE, STR_NONE);
+            return GameActions::Result(GameActions::Status::InvalidParameters,
+                STR_ERR_INVALID_PARAMETER, STR_ERR_RIDE_NOT_FOUND);
 
         if (isExecuting)
         {
@@ -652,7 +666,8 @@ namespace OpenRCT2::TileInspector
     {
         TileElement* const wallElement = MapGetNthElementAt(loc, elementIndex);
         if (wallElement == nullptr || wallElement->GetType() != TileElementType::Wall)
-            return GameActions::Result(GameActions::Status::Unknown, STR_NONE, STR_NONE);
+            return GameActions::Result(GameActions::Status::InvalidParameters,
+                STR_ERR_INVALID_PARAMETER, STR_ERR_WALL_ELEMENT_NOT_FOUND);
 
         if (isExecuting)
         {
@@ -668,7 +683,8 @@ namespace OpenRCT2::TileInspector
     {
         TileElement* const wallElement = MapGetNthElementAt(loc, elementIndex);
         if (wallElement == nullptr || wallElement->GetType() != TileElementType::Wall)
-            return GameActions::Result(GameActions::Status::Unknown, STR_NONE, STR_NONE);
+            return GameActions::Result(GameActions::Status::InvalidParameters,
+                STR_ERR_INVALID_PARAMETER, STR_ERR_WALL_ELEMENT_NOT_FOUND);
 
         if (isExecuting)
         {
@@ -688,7 +704,8 @@ namespace OpenRCT2::TileInspector
 
         TileElement* const trackElement = MapGetNthElementAt(loc, elementIndex);
         if (trackElement == nullptr || trackElement->GetType() != TileElementType::Track)
-            return GameActions::Result(GameActions::Status::Unknown, STR_NONE, STR_NONE);
+            return GameActions::Result(GameActions::Status::InvalidParameters,
+                STR_ERR_INVALID_PARAMETER, STR_ERR_TRACK_ELEMENT_NOT_FOUND);
 
         if (isExecuting)
         {
@@ -700,12 +717,14 @@ namespace OpenRCT2::TileInspector
             auto rideIndex = trackElement->AsTrack()->GetRideIndex();
             auto ride = GetRide(rideIndex);
             if (ride == nullptr)
-                return GameActions::Result(GameActions::Status::Unknown, STR_NONE, STR_NONE);
+                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::Unknown, STR_NONE, STR_NONE);
+                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 };
@@ -724,11 +743,12 @@ namespace OpenRCT2::TileInspector
                 offsets.y = trackBlock->y;
                 elem += offsets.Rotate(originDirection);
 
-                TrackElement* tileElement = MapGetTrackElementAtOfTypeSeq(elem, type, trackBlock->index);
-                if (tileElement == nullptr)
+                TrackElement* trackElement = MapGetTrackElementAtOfTypeSeq(elem, type, trackBlock->index);
+                if (trackElement == nullptr)
                 {
                     LOG_ERROR("Track map element part not found!");
-                    return GameActions::Result(GameActions::Status::Unknown, STR_NONE, STR_NONE);
+                    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
@@ -738,8 +758,8 @@ namespace OpenRCT2::TileInspector
                 // Keep?
                 // invalidate_test_results(ride);
 
-                tileElement->BaseHeight += offset;
-                tileElement->ClearanceHeight += offset;
+                trackElement->BaseHeight += offset;
+                trackElement->ClearanceHeight += offset;
             }
         }
 
@@ -754,7 +774,8 @@ namespace OpenRCT2::TileInspector
     {
         TileElement* const trackElement = MapGetNthElementAt(loc, elementIndex);
         if (trackElement == nullptr || trackElement->GetType() != TileElementType::Track)
-            return GameActions::Result(GameActions::Status::Unknown, STR_NONE, STR_NONE);
+            return GameActions::Result(GameActions::Status::InvalidParameters,
+                STR_ERR_INVALID_PARAMETER, STR_ERR_TRACK_ELEMENT_NOT_FOUND);
 
         if (isExecuting)
         {
@@ -777,12 +798,14 @@ namespace OpenRCT2::TileInspector
             auto rideIndex = trackElement->AsTrack()->GetRideIndex();
             auto ride = GetRide(rideIndex);
             if (ride == nullptr)
-                return GameActions::Result(GameActions::Status::Unknown, STR_NONE, STR_NONE);
+                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::Unknown, STR_NONE, STR_NONE);
+                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 };
@@ -801,11 +824,12 @@ namespace OpenRCT2::TileInspector
                 offsets.y = trackBlock->y;
                 elem += offsets.Rotate(originDirection);
 
-                TrackElement* tileElement = MapGetTrackElementAtOfTypeSeq(elem, type, trackBlock->index);
-                if (tileElement == nullptr)
+                TrackElement* trackElement = MapGetTrackElementAtOfTypeSeq(elem, type, trackBlock->index);
+                if (trackElement == nullptr)
                 {
                     LOG_ERROR("Track map element part not found!");
-                    return GameActions::Result(GameActions::Status::Unknown, STR_NONE, STR_NONE);
+                    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
@@ -815,9 +839,9 @@ namespace OpenRCT2::TileInspector
                 // Keep?
                 // invalidate_test_results(ride);
 
-                if (tileElement->AsTrack()->HasChain() != setChain)
+                if (trackElement->AsTrack()->HasChain() != setChain)
                 {
-                    tileElement->AsTrack()->SetHasChain(setChain);
+                    trackElement->AsTrack()->SetHasChain(setChain);
                 }
             }
         }
@@ -829,7 +853,8 @@ namespace OpenRCT2::TileInspector
     {
         TileElement* const trackElement = MapGetNthElementAt(loc, elementIndex);
         if (trackElement == nullptr || trackElement->GetType() != TileElementType::Track)
-            return GameActions::Result(GameActions::Status::Unknown, STR_NONE, STR_NONE);
+            return GameActions::Result(GameActions::Status::InvalidParameters,
+                STR_ERR_INVALID_PARAMETER, STR_ERR_TRACK_ELEMENT_NOT_FOUND);
 
         if (isExecuting)
         {
@@ -844,7 +869,8 @@ namespace OpenRCT2::TileInspector
     {
         TileElement* const trackElement = MapGetNthElementAt(loc, elementIndex);
         if (trackElement == nullptr || trackElement->GetType() != TileElementType::Track)
-            return GameActions::Result(GameActions::Status::Unknown, STR_NONE, STR_NONE);
+            return GameActions::Result(GameActions::Status::InvalidParameters,
+                STR_ERR_INVALID_PARAMETER, STR_ERR_TRACK_ELEMENT_NOT_FOUND);
 
         if (isExecuting)
         {
@@ -859,7 +885,8 @@ namespace OpenRCT2::TileInspector
     {
         TileElement* const tileElement = MapGetNthElementAt(loc, elementIndex);
         if (tileElement == nullptr || tileElement->GetType() != TileElementType::SmallScenery)
-            return GameActions::Result(GameActions::Status::Unknown, STR_NONE, STR_NONE);
+            return GameActions::Result(GameActions::Status::InvalidParameters,
+                STR_ERR_INVALID_PARAMETER, STR_ERR_TILE_ELEMENT_NOT_FOUND);
 
         if (isExecuting)
         {
@@ -878,7 +905,8 @@ namespace OpenRCT2::TileInspector
     {
         TileElement* const tileElement = MapGetNthElementAt(loc, elementIndex);
         if (tileElement == nullptr || tileElement->GetType() != TileElementType::SmallScenery)
-            return GameActions::Result(GameActions::Status::Unknown, STR_NONE, STR_NONE);
+            return GameActions::Result(GameActions::Status::InvalidParameters,
+                STR_ERR_INVALID_PARAMETER, STR_ERR_TILE_ELEMENT_NOT_FOUND);
 
         if (isExecuting)
         {
@@ -894,7 +922,8 @@ namespace OpenRCT2::TileInspector
     {
         TileElement* const bannerElement = MapGetNthElementAt(loc, elementIndex);
         if (bannerElement == nullptr || bannerElement->GetType() != TileElementType::Banner)
-            return GameActions::Result(GameActions::Status::Unknown, STR_NONE, STR_NONE);
+            return GameActions::Result(GameActions::Status::InvalidParameters,
+                STR_ERR_INVALID_PARAMETER, STR_ERR_BANNER_ELEMENT_NOT_FOUND);
 
         if (isExecuting)
         {

From 32c880ef890c6e3e19f5d4207c9d8969516feb40 Mon Sep 17 00:00:00 2001
From: Peter Froud <pfroud@gmail.com>
Date: Mon, 22 Jan 2024 01:30:13 -0800
Subject: [PATCH 02/13] 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<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;
     }
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<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();

From 7903845eae5051e0edd3a57747d7cde270df7638 Mon Sep 17 00:00:00 2001
From: Peter Froud <pfroud@gmail.com>
Date: Mon, 22 Jan 2024 01:45:29 -0800
Subject: [PATCH 03/13] Add "element" to STR_ERR_GHOST_NOT_FOUND

---
 src/openrct2/actions/RideEntranceExitRemoveAction.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/openrct2/actions/RideEntranceExitRemoveAction.cpp b/src/openrct2/actions/RideEntranceExitRemoveAction.cpp
index 3522c5a3df..c7ad9d5299 100644
--- a/src/openrct2/actions/RideEntranceExitRemoveAction.cpp
+++ b/src/openrct2/actions/RideEntranceExitRemoveAction.cpp
@@ -95,7 +95,7 @@ GameActions::Result RideEntranceExitRemoveAction::Query() const
     // If we are trying to remove a ghost and the element we found is real, return an error, but don't log a warning
     if (entranceElement != nullptr && (GetFlags() & GAME_COMMAND_FLAG_GHOST) && !(entranceElement->IsGhost()))
     {
-        return GameActions::Result(GameActions::Status::InvalidParameters, STR_ERR_GHOST_NOT_FOUND, STR_NONE);
+        return GameActions::Result(GameActions::Status::InvalidParameters, STR_ERR_GHOST_ELEMENT_NOT_FOUND, STR_NONE);
     }
     else if (entranceElement == nullptr)
     {
@@ -133,7 +133,7 @@ GameActions::Result RideEntranceExitRemoveAction::Execute() const
     // If we are trying to remove a ghost and the element we found is real, return an error, but don't log a warning
     if (entranceElement != nullptr && isGhost && !(entranceElement->IsGhost()))
     {
-        return GameActions::Result(GameActions::Status::InvalidParameters, STR_ERR_GHOST_NOT_FOUND, STR_NONE);
+        return GameActions::Result(GameActions::Status::InvalidParameters, STR_ERR_GHOST_ELEMENT_NOT_FOUND, STR_NONE);
     }
     else if (entranceElement == nullptr)
     {

From 648941aa11fb3fe378d113e4ca44e4e8cf1a0206 Mon Sep 17 00:00:00 2001
From: Peter Froud <pfroud@gmail.com>
Date: Mon, 22 Jan 2024 01:47:14 -0800
Subject: [PATCH 04/13] Add constants to StringIds.h and en-GB.txt

---
 data/language/en-GB.txt               | 16 ++++++++++++++++
 src/openrct2/localisation/StringIds.h | 17 +++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/data/language/en-GB.txt b/data/language/en-GB.txt
index 7197fa7db6..976b814871 100644
--- a/data/language/en-GB.txt
+++ b/data/language/en-GB.txt
@@ -3699,6 +3699,22 @@ STR_6593    :Remove park fences
 STR_6594    :Tile Inspector: Toggle wall slope
 STR_6595    :{WINDOW_COLOUR_2}Author: {BLACK}{STRING}
 STR_6596    :{WINDOW_COLOUR_2}Authors: {BLACK}{STRING}
+STR_6597    :Invalid parameter
+STR_6598    :Value out of range
+STR_6599    :Ghost element not found
+STR_6600    :Balloon not found
+STR_6601    :Staff not found
+STR_6602    :Ride not found
+STR_6603    :Ride object entry not found
+STR_6604    :Player not found
+STR_6605    :Entrance element not found
+STR_6606    :Surface element not found
+STR_6607    :Tile element not found
+STR_6608    :Track element not found
+STR_6609    :Track block not found
+STR_6610    :Path element not found
+STR_6611    :Wall element not found
+STR_6612    :Banner element not found
 
 #############
 # Scenarios #
diff --git a/src/openrct2/localisation/StringIds.h b/src/openrct2/localisation/StringIds.h
index 53f3b3c700..e1c8bf952d 100644
--- a/src/openrct2/localisation/StringIds.h
+++ b/src/openrct2/localisation/StringIds.h
@@ -4007,6 +4007,23 @@ enum : uint16_t
     STR_SCENERY_AUTHOR = 6595,
     STR_SCENERY_AUTHOR_PLURAL = 6596,
 
+    STR_ERR_INVALID_PARAMETER = 6597,
+    STR_ERR_VALUE_OUT_OF_RANGE = 6598,
+    STR_ERR_GHOST_ELEMENT_NOT_FOUND = 6599,
+    STR_ERR_BALLOON_NOT_FOUND = 6600,
+    STR_ERR_STAFF_NOT_FOUND = 6601,
+    STR_ERR_RIDE_NOT_FOUND = 6602,
+    STR_ERR_RIDE_OBJECT_ENTRY_NOT_FOUND = 6603,
+    STR_ERR_PLAYER_NOT_FOUND = 6604,
+    STR_ERR_ENTRANCE_ELEMENT_NOT_FOUND = 6605,
+    STR_ERR_SURFACE_ELEMENT_NOT_FOUND = 6606,
+    STR_ERR_TILE_ELEMENT_NOT_FOUND = 6607,
+    STR_ERR_TRACK_ELEMENT_NOT_FOUND = 6608,
+    STR_ERR_TRACK_BLOCK_NOT_FOUND = 6609,
+    STR_ERR_PATH_ELEMENT_NOT_FOUND = 6610,
+    STR_ERR_WALL_ELEMENT_NOT_FOUND = 6611,
+    STR_ERR_BANNER_ELEMENT_NOT_FOUND = 6612,
+
     // Have to include resource strings (from scenarios and objects) for the time being now that language is partially working
     /* MAX_STR_COUNT = 32768 */ // MAX_STR_COUNT - upper limit for number of strings, not the current count strings
 };

From 4145f851da6c2e804c67761e048ab87c95055fc1 Mon Sep 17 00:00:00 2001
From: Peter Froud <pfroud@gmail.com>
Date: Mon, 22 Jan 2024 02:29:08 -0800
Subject: [PATCH 05/13] Run clang-format

---
 src/openrct2/actions/BalloonPressAction.cpp   |   8 +-
 src/openrct2/actions/CheatSetAction.cpp       |  16 +--
 src/openrct2/actions/GameSetSpeedAction.cpp   |   8 +-
 src/openrct2/actions/LandSetHeightAction.cpp  |   8 +-
 src/openrct2/actions/LandSetRightsAction.cpp  |   8 +-
 src/openrct2/actions/ParkSetDateAction.cpp    |   4 +-
 .../actions/ParkSetEntranceFeeAction.cpp      |   4 +-
 .../actions/ParkSetParameterAction.cpp        |   8 +-
 .../actions/ParkSetResearchFundingAction.cpp  |   4 +-
 .../actions/RideEntranceExitRemoveAction.cpp  |  18 ++-
 .../actions/RideFreezeRatingAction.cpp        |   7 +-
 .../actions/RideSetAppearanceAction.cpp       |  18 ++-
 src/openrct2/actions/RideSetPriceAction.cpp   |  14 +--
 .../actions/ScenarioSetSettingAction.cpp      |   7 +-
 src/openrct2/actions/StaffFireAction.cpp      |   9 +-
 .../actions/StaffSetCostumeAction.cpp         |  13 +-
 src/openrct2/actions/StaffSetOrdersAction.cpp |   6 +-
 .../actions/StaffSetPatrolAreaAction.cpp      |   3 +-
 src/openrct2/actions/TileModifyAction.cpp     |   4 +-
 .../actions/TrackSetBrakeSpeedAction.cpp      |   4 +-
 src/openrct2/actions/WaterSetHeightAction.cpp |   8 +-
 src/openrct2/network/NetworkBase.cpp          |   7 +-
 src/openrct2/ride/TrackDesign.cpp             |   9 +-
 src/openrct2/world/TileInspector.cpp          | 116 +++++++++---------
 24 files changed, 147 insertions(+), 164 deletions(-)

diff --git a/src/openrct2/actions/BalloonPressAction.cpp b/src/openrct2/actions/BalloonPressAction.cpp
index 91517fed4d..f8e4fdc052 100644
--- a/src/openrct2/actions/BalloonPressAction.cpp
+++ b/src/openrct2/actions/BalloonPressAction.cpp
@@ -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();
diff --git a/src/openrct2/actions/CheatSetAction.cpp b/src/openrct2/actions/CheatSetAction.cpp
index 3839598b3c..c6b453fd62 100644
--- a/src/openrct2/actions/CheatSetAction.cpp
+++ b/src/openrct2/actions/CheatSetAction.cpp
@@ -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;
     }
diff --git a/src/openrct2/actions/GameSetSpeedAction.cpp b/src/openrct2/actions/GameSetSpeedAction.cpp
index 7dd5fe2b78..6e30aed3a0 100644
--- a/src/openrct2/actions/GameSetSpeedAction.cpp
+++ b/src/openrct2/actions/GameSetSpeedAction.cpp
@@ -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;
diff --git a/src/openrct2/actions/LandSetHeightAction.cpp b/src/openrct2/actions/LandSetHeightAction.cpp
index 848fba6068..25d24b878b 100644
--- a/src/openrct2/actions/LandSetHeightAction.cpp
+++ b/src/openrct2/actions/LandSetHeightAction.cpp
@@ -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));
diff --git a/src/openrct2/actions/LandSetRightsAction.cpp b/src/openrct2/actions/LandSetRightsAction.cpp
index 5eba026928..1ed0cc10b9 100644
--- a/src/openrct2/actions/LandSetRightsAction.cpp
+++ b/src/openrct2/actions/LandSetRightsAction.cpp
@@ -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);
     }
 }
diff --git a/src/openrct2/actions/ParkSetDateAction.cpp b/src/openrct2/actions/ParkSetDateAction.cpp
index 67820e0cee..ae6345dd5a 100644
--- a/src/openrct2/actions/ParkSetDateAction.cpp
+++ b/src/openrct2/actions/ParkSetDateAction.cpp
@@ -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();
diff --git a/src/openrct2/actions/ParkSetEntranceFeeAction.cpp b/src/openrct2/actions/ParkSetEntranceFeeAction.cpp
index 7455ae94c7..a297653a9b 100644
--- a/src/openrct2/actions/ParkSetEntranceFeeAction.cpp
+++ b/src/openrct2/actions/ParkSetEntranceFeeAction.cpp
@@ -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();
 }
diff --git a/src/openrct2/actions/ParkSetParameterAction.cpp b/src/openrct2/actions/ParkSetParameterAction.cpp
index a6d09f3214..2c6a3f8ae1 100644
--- a/src/openrct2/actions/ParkSetParameterAction.cpp
+++ b/src/openrct2/actions/ParkSetParameterAction.cpp
@@ -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();
diff --git a/src/openrct2/actions/ParkSetResearchFundingAction.cpp b/src/openrct2/actions/ParkSetResearchFundingAction.cpp
index 5c0fbb8fab..055b4a94cf 100644
--- a/src/openrct2/actions/ParkSetResearchFundingAction.cpp
+++ b/src/openrct2/actions/ParkSetResearchFundingAction.cpp
@@ -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();
 }
diff --git a/src/openrct2/actions/RideEntranceExitRemoveAction.cpp b/src/openrct2/actions/RideEntranceExitRemoveAction.cpp
index c7ad9d5299..39f4a5fdf5 100644
--- a/src/openrct2/actions/RideEntranceExitRemoveAction.cpp
+++ b/src/openrct2/actions/RideEntranceExitRemoveAction.cpp
@@ -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();
diff --git a/src/openrct2/actions/RideFreezeRatingAction.cpp b/src/openrct2/actions/RideFreezeRatingAction.cpp
index b97f1de56c..0784279540 100644
--- a/src/openrct2/actions/RideFreezeRatingAction.cpp
+++ b/src/openrct2/actions/RideFreezeRatingAction.cpp
@@ -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();
diff --git a/src/openrct2/actions/RideSetAppearanceAction.cpp b/src/openrct2/actions/RideSetAppearanceAction.cpp
index 027b9489e5..a1405ed462 100644
--- a/src/openrct2/actions/RideSetAppearanceAction.cpp
+++ b/src/openrct2/actions/RideSetAppearanceAction.cpp
@@ -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)
diff --git a/src/openrct2/actions/RideSetPriceAction.cpp b/src/openrct2/actions/RideSetPriceAction.cpp
index 6e6eb6e774..b418b07f6d 100644
--- a/src/openrct2/actions/RideSetPriceAction.cpp
+++ b/src/openrct2/actions/RideSetPriceAction.cpp
@@ -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())
diff --git a/src/openrct2/actions/ScenarioSetSettingAction.cpp b/src/openrct2/actions/ScenarioSetSettingAction.cpp
index 723acf4597..9b4a2aa3bc 100644
--- a/src/openrct2/actions/ScenarioSetSettingAction.cpp
+++ b/src/openrct2/actions/ScenarioSetSettingAction.cpp
@@ -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();
diff --git a/src/openrct2/actions/StaffFireAction.cpp b/src/openrct2/actions/StaffFireAction.cpp
index 7524c9c6e3..93dd85e371 100644
--- a/src/openrct2/actions/StaffFireAction.cpp
+++ b/src/openrct2/actions/StaffFireAction.cpp
@@ -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);
diff --git a/src/openrct2/actions/StaffSetCostumeAction.cpp b/src/openrct2/actions/StaffSetCostumeAction.cpp
index c0aeadaf15..27ac8235e7 100644
--- a/src/openrct2/actions/StaffSetCostumeAction.cpp
+++ b/src/openrct2/actions/StaffSetCostumeAction.cpp
@@ -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);
diff --git a/src/openrct2/actions/StaffSetOrdersAction.cpp b/src/openrct2/actions/StaffSetOrdersAction.cpp
index f2c3f1fcf0..1d0d067995 100644
--- a/src/openrct2/actions/StaffSetOrdersAction.cpp
+++ b/src/openrct2/actions/StaffSetOrdersAction.cpp
@@ -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;
 
diff --git a/src/openrct2/actions/StaffSetPatrolAreaAction.cpp b/src/openrct2/actions/StaffSetPatrolAreaAction.cpp
index 740d0a2ccd..e850755363 100644
--- a/src/openrct2/actions/StaffSetPatrolAreaAction.cpp
+++ b/src/openrct2/actions/StaffSetPatrolAreaAction.cpp
@@ -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);
diff --git a/src/openrct2/actions/TileModifyAction.cpp b/src/openrct2/actions/TileModifyAction.cpp
index b13cf99202..84c8e71cbd 100644
--- a/src/openrct2/actions/TileModifyAction.cpp
+++ b/src/openrct2/actions/TileModifyAction.cpp
@@ -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;
diff --git a/src/openrct2/actions/TrackSetBrakeSpeedAction.cpp b/src/openrct2/actions/TrackSetBrakeSpeedAction.cpp
index 86af1f9ef1..478f7ec794 100644
--- a/src/openrct2/actions/TrackSetBrakeSpeedAction.cpp
+++ b/src/openrct2/actions/TrackSetBrakeSpeedAction.cpp
@@ -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)
diff --git a/src/openrct2/actions/WaterSetHeightAction.cpp b/src/openrct2/actions/WaterSetHeightAction.cpp
index 8e27d18b6b..356e45aa16 100644
--- a/src/openrct2/actions/WaterSetHeightAction.cpp
+++ b/src/openrct2/actions/WaterSetHeightAction.cpp
@@ -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)
diff --git a/src/openrct2/network/NetworkBase.cpp b/src/openrct2/network/NetworkBase.cpp
index 28d5c0112d..6a9c61845c 100644
--- a/src/openrct2/network/NetworkBase.cpp
+++ b/src/openrct2/network/NetworkBase.cpp
@@ -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)
diff --git a/src/openrct2/ride/TrackDesign.cpp b/src/openrct2/ride/TrackDesign.cpp
index 5239bf2bde..8f26c0675f 100644
--- a/src/openrct2/ride/TrackDesign.cpp
+++ b/src/openrct2/ride/TrackDesign.cpp
@@ -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();
diff --git a/src/openrct2/world/TileInspector.cpp b/src/openrct2/world/TileInspector.cpp
index cddd0fe14a..93a7fed3af 100644
--- a/src/openrct2/world/TileInspector.cpp
+++ b/src/openrct2/world/TileInspector.cpp
@@ -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)
         {

From 7302d718e3062cba45aa8c69db6d6b9f8ced0304 Mon Sep 17 00:00:00 2001
From: Peter Froud <pfroud@gmail.com>
Date: Mon, 22 Jan 2024 02:49:19 -0800
Subject: [PATCH 06/13] Fix local variable shadowing a previous local

---
 src/openrct2/world/TileInspector.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/openrct2/world/TileInspector.cpp b/src/openrct2/world/TileInspector.cpp
index 93a7fed3af..2c5b7b4317 100644
--- a/src/openrct2/world/TileInspector.cpp
+++ b/src/openrct2/world/TileInspector.cpp
@@ -743,8 +743,8 @@ namespace OpenRCT2::TileInspector
                 offsets.y = trackBlock->y;
                 elem += offsets.Rotate(originDirection);
 
-                TrackElement* trackElement = MapGetTrackElementAtOfTypeSeq(elem, type, trackBlock->index);
-                if (trackElement == nullptr)
+                TrackElement* nextTrackElement = MapGetTrackElementAtOfTypeSeq(elem, type, trackBlock->index);
+                if (nextTrackElement == nullptr)
                 {
                     LOG_ERROR("Track map element part not found!");
                     return GameActions::Result(
@@ -758,8 +758,8 @@ namespace OpenRCT2::TileInspector
                 // Keep?
                 // invalidate_test_results(ride);
 
-                trackElement->BaseHeight += offset;
-                trackElement->ClearanceHeight += offset;
+                nextTrackElement->BaseHeight += offset;
+                nextTrackElement->ClearanceHeight += offset;
             }
         }
 
@@ -824,8 +824,8 @@ namespace OpenRCT2::TileInspector
                 offsets.y = trackBlock->y;
                 elem += offsets.Rotate(originDirection);
 
-                TrackElement* trackElement = MapGetTrackElementAtOfTypeSeq(elem, type, trackBlock->index);
-                if (trackElement == nullptr)
+                TrackElement* nextTrackElement = MapGetTrackElementAtOfTypeSeq(elem, type, trackBlock->index);
+                if (nextTrackElement == nullptr)
                 {
                     LOG_ERROR("Track map element part not found!");
                     return GameActions::Result(
@@ -839,9 +839,9 @@ namespace OpenRCT2::TileInspector
                 // Keep?
                 // invalidate_test_results(ride);
 
-                if (trackElement->AsTrack()->HasChain() != setChain)
+                if (nextTrackElement->AsTrack()->HasChain() != setChain)
                 {
-                    trackElement->AsTrack()->SetHasChain(setChain);
+                    nextTrackElement->AsTrack()->SetHasChain(setChain);
                 }
             }
         }

From f272b57a88dadba49575086ebea2035812f4367d Mon Sep 17 00:00:00 2001
From: Peter Froud <pfroud@gmail.com>
Date: Mon, 22 Jan 2024 02:55:20 -0800
Subject: [PATCH 07/13] Fix 'break' will never be executed compile error

---
 src/openrct2/actions/CheatSetAction.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/openrct2/actions/CheatSetAction.cpp b/src/openrct2/actions/CheatSetAction.cpp
index c6b453fd62..b9e165d039 100644
--- a/src/openrct2/actions/CheatSetAction.cpp
+++ b/src/openrct2/actions/CheatSetAction.cpp
@@ -262,7 +262,6 @@ GameActions::Result CheatSetAction::Execute() const
             return GameActions::Result(
                 GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE);
         }
-        break;
     }
 
     if (NetworkGetMode() == NETWORK_MODE_NONE)

From 2059b50f4427436aaeda14f3f902b9afe5fc63e4 Mon Sep 17 00:00:00 2001
From: Michael Steenbeek <m.o.steenbeek@gmail.com>
Date: Sun, 28 Jan 2024 00:06:54 +0100
Subject: [PATCH 08/13] Small change to error message

---
 src/openrct2/actions/RideEntranceExitRemoveAction.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/openrct2/actions/RideEntranceExitRemoveAction.cpp b/src/openrct2/actions/RideEntranceExitRemoveAction.cpp
index 39f4a5fdf5..4ea938b8c6 100644
--- a/src/openrct2/actions/RideEntranceExitRemoveAction.cpp
+++ b/src/openrct2/actions/RideEntranceExitRemoveAction.cpp
@@ -99,7 +99,7 @@ GameActions::Result RideEntranceExitRemoveAction::Query() const
     else if (entranceElement == nullptr)
     {
         LOG_WARNING(
-            "Entrance not found. x = %d, y = %d, ride = %u, station = %u", _loc.x, _loc.y, _rideIndex.ToUnderlying(),
+            "Entrance element 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);
@@ -136,7 +136,7 @@ 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(),
+            "Entrance element 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);

From 7bb8fd7131ea9d2b8e62935bb5d1d058ca8f7b1b Mon Sep 17 00:00:00 2001
From: Peter Froud <pfroud@gmail.com>
Date: Sun, 28 Jan 2024 21:27:35 -0800
Subject: [PATCH 09/13] Add `INVALID_PARAMETER` for `GHOST_ELEMENT_NOT_FOUND`

Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
---
 src/openrct2/actions/RideEntranceExitRemoveAction.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/openrct2/actions/RideEntranceExitRemoveAction.cpp b/src/openrct2/actions/RideEntranceExitRemoveAction.cpp
index 4ea938b8c6..f70cb5fb15 100644
--- a/src/openrct2/actions/RideEntranceExitRemoveAction.cpp
+++ b/src/openrct2/actions/RideEntranceExitRemoveAction.cpp
@@ -94,7 +94,7 @@ GameActions::Result RideEntranceExitRemoveAction::Query() const
     // If we are trying to remove a ghost and the element we found is real, return an error, but don't log a warning
     if (entranceElement != nullptr && (GetFlags() & GAME_COMMAND_FLAG_GHOST) && !(entranceElement->IsGhost()))
     {
-        return GameActions::Result(GameActions::Status::InvalidParameters, STR_ERR_GHOST_ELEMENT_NOT_FOUND, STR_NONE);
+        return GameActions::Result(GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_GHOST_ELEMENT_NOT_FOUND);
     }
     else if (entranceElement == nullptr)
     {

From 704c779bf20a01de7aed47ff6fa0cbc67b5a90fa Mon Sep 17 00:00:00 2001
From: Peter Froud <pfroud@gmail.com>
Date: Mon, 29 Jan 2024 02:15:27 -0800
Subject: [PATCH 10/13] Format code which was committed on github.com

---
 src/openrct2/actions/RideEntranceExitRemoveAction.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/openrct2/actions/RideEntranceExitRemoveAction.cpp b/src/openrct2/actions/RideEntranceExitRemoveAction.cpp
index f70cb5fb15..501d6ba3a2 100644
--- a/src/openrct2/actions/RideEntranceExitRemoveAction.cpp
+++ b/src/openrct2/actions/RideEntranceExitRemoveAction.cpp
@@ -94,7 +94,8 @@ GameActions::Result RideEntranceExitRemoveAction::Query() const
     // If we are trying to remove a ghost and the element we found is real, return an error, but don't log a warning
     if (entranceElement != nullptr && (GetFlags() & GAME_COMMAND_FLAG_GHOST) && !(entranceElement->IsGhost()))
     {
-        return GameActions::Result(GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_GHOST_ELEMENT_NOT_FOUND);
+        return GameActions::Result(
+            GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_GHOST_ELEMENT_NOT_FOUND);
     }
     else if (entranceElement == nullptr)
     {

From 01d9eeb2669f50bd36ebd5c32399327c02339978 Mon Sep 17 00:00:00 2001
From: Peter Froud <pfroud@gmail.com>
Date: Mon, 29 Jan 2024 02:15:53 -0800
Subject: [PATCH 11/13] `INVALID_PARAMETER` for `GHOST_ELEMENT_NOT_FOUND`

Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
---
 src/openrct2/actions/RideEntranceExitRemoveAction.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/openrct2/actions/RideEntranceExitRemoveAction.cpp b/src/openrct2/actions/RideEntranceExitRemoveAction.cpp
index 501d6ba3a2..2ae9f89b4a 100644
--- a/src/openrct2/actions/RideEntranceExitRemoveAction.cpp
+++ b/src/openrct2/actions/RideEntranceExitRemoveAction.cpp
@@ -132,7 +132,8 @@ GameActions::Result RideEntranceExitRemoveAction::Execute() const
     // If we are trying to remove a ghost and the element we found is real, return an error, but don't log a warning
     if (entranceElement != nullptr && isGhost && !(entranceElement->IsGhost()))
     {
-        return GameActions::Result(GameActions::Status::InvalidParameters, STR_ERR_GHOST_ELEMENT_NOT_FOUND, STR_NONE);
+        return GameActions::Result(
+            GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_GHOST_ELEMENT_NOT_FOUND);
     }
     else if (entranceElement == nullptr)
     {

From 21bda5e5e44a5cc53ba749a420afe8e7106302d8 Mon Sep 17 00:00:00 2001
From: Peter Froud <pfroud@gmail.com>
Date: Mon, 29 Jan 2024 02:17:56 -0800
Subject: [PATCH 12/13] Use `TILE_ELEMENT_NOT_FOUND`

Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
---
 src/openrct2/actions/TrackSetBrakeSpeedAction.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/openrct2/actions/TrackSetBrakeSpeedAction.cpp b/src/openrct2/actions/TrackSetBrakeSpeedAction.cpp
index 478f7ec794..4d62749c23 100644
--- a/src/openrct2/actions/TrackSetBrakeSpeedAction.cpp
+++ b/src/openrct2/actions/TrackSetBrakeSpeedAction.cpp
@@ -65,7 +65,7 @@ GameActions::Result TrackSetBrakeSpeedAction::QueryExecute(bool isExecuting) con
     {
         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);
+            GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_TILE_ELEMENT_NOT_FOUND);
     }
 
     if (isExecuting)

From a382e4be8abc415c50d11d93b7e6933c5d88324d Mon Sep 17 00:00:00 2001
From: Peter Froud <pfroud@gmail.com>
Date: Mon, 29 Jan 2024 02:50:52 -0800
Subject: [PATCH 13/13] Use `VALUE_OUF_OF_RANGE` for `spriteId` checks

Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
---
 src/openrct2/actions/StaffFireAction.cpp       | 3 ++-
 src/openrct2/actions/StaffSetCostumeAction.cpp | 3 ++-
 src/openrct2/actions/StaffSetOrdersAction.cpp  | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/openrct2/actions/StaffFireAction.cpp b/src/openrct2/actions/StaffFireAction.cpp
index 93dd85e371..9bf45c6a93 100644
--- a/src/openrct2/actions/StaffFireAction.cpp
+++ b/src/openrct2/actions/StaffFireAction.cpp
@@ -39,7 +39,8 @@ 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_VALUE_OUT_OF_RANGE);
     }
 
     auto staff = TryGetEntity<Staff>(_spriteId);
diff --git a/src/openrct2/actions/StaffSetCostumeAction.cpp b/src/openrct2/actions/StaffSetCostumeAction.cpp
index 27ac8235e7..099462e2d4 100644
--- a/src/openrct2/actions/StaffSetCostumeAction.cpp
+++ b/src/openrct2/actions/StaffSetCostumeAction.cpp
@@ -64,7 +64,8 @@ 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_VALUE_OUT_OF_RANGE);
     }
 
     auto* staff = TryGetEntity<Staff>(_spriteIndex);
diff --git a/src/openrct2/actions/StaffSetOrdersAction.cpp b/src/openrct2/actions/StaffSetOrdersAction.cpp
index 1d0d067995..a2cdf8909c 100644
--- a/src/openrct2/actions/StaffSetOrdersAction.cpp
+++ b/src/openrct2/actions/StaffSetOrdersAction.cpp
@@ -45,7 +45,8 @@ 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_VALUE_OUT_OF_RANGE);
     }
 
     auto* staff = TryGetEntity<Staff>(_spriteIndex);