Squash: final manual correction for the night...

OpenRCT2 · May 10, 2024 · 0799656 · 0799656
1 parent 77af3fc
commit 0799656
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 9 deletions.
diff --git a/src/openrct2-ui/UiStringIds.h b/src/openrct2-ui/UiStringIds.h
@@ -278,7 +278,7 @@ namespace OpenRCT2
         STR_THANKS_TO_PEOPLE = 857,
 
         // Window: AssetPacks
-    	STR_ASSET_PACKS = 6520,
+        STR_ASSET_PACKS = 6520,
         STR_BASE_GRAPHICS_MUSIC_SOUND = 6526,
         STR_DECREASE_PRIOTITY_TIP = 6523,
         STR_HIGH_PRIORITY = 6522,
@@ -623,7 +623,7 @@ namespace OpenRCT2
         STR_FINANCES_SHOW_WEEKLY_PROFIT_TAB_TIP = 2460,
         STR_FINANCES_SUMMARY_AT_X_PER_YEAR = 1911,
         STR_FINANCES_SUMMARY_EXPENDITURE_INCOME = 1896,
-    	STR_FINANCES_SUMMARY_EXPENDITURE_VALUE = 1914,
+        STR_FINANCES_SUMMARY_EXPENDITURE_VALUE = 1914,
         STR_FINANCES_SUMMARY_FOOD_DRINK_SALES = 1905,
         STR_FINANCES_SUMMARY_FOOD_DRINK_STOCK = 1906,
         STR_FINANCES_SUMMARY_INCOME_VALUE = 1913,
@@ -893,6 +893,8 @@ namespace OpenRCT2
         STR_MAP_TOOLTIP_STRINGID = 1162,
 
         // Window: MazeConstruction
+        STR_RIDE_CONSTRUCTION_BUILD = 1732,
+        STR_RIDE_CONSTRUCTION_BUILD_MAZE_IN_THIS_DIRECTION_TIP = 1761,
         STR_RIDE_CONSTRUCTION_BUILD_MODE = 1758,
         STR_RIDE_CONSTRUCTION_FILL_IN_MODE = 1760,
         STR_RIDE_CONSTRUCTION_MODE = 1733,
@@ -2020,7 +2022,7 @@ namespace OpenRCT2
         STR_TILE_INSPECTOR_SURFACE_RESTORE_FENCES = 5940,
         STR_TILE_INSPECTOR_SURFACE_TERAIN = 5934,
         STR_TILE_INSPECTOR_SURFACE_WATER_LEVEL = 5938,
-    	STR_TILE_INSPECTOR_TITLE = 5314,
+        STR_TILE_INSPECTOR_TITLE = 5314,
         STR_TILE_INSPECTOR_TRACK_BLOCK_BRAKE = 6319,
         STR_TILE_INSPECTOR_TRACK_BRAKE_CLOSED = 6539,
         STR_TILE_INSPECTOR_TRACK_CHAIN_LIFT = 5949,
@@ -2106,6 +2108,7 @@ namespace OpenRCT2
         STR_RIDES_IN_PARK_TIP = 1053,
         STR_ROTATE_ANTI_CLOCKWISE = 5459,
         STR_ROTATE_CLOCKWISE = 5458,
+        STR_ROTATE_90_TIP = 1404,
         STR_ROTATE_TIP = 832,
         STR_SAVE_GAME_AS = 5512,
         STR_SAVE_LANDSCAPE = 885,

diff --git a/src/openrct2-ui/windows/Park.cpp b/src/openrct2-ui/windows/Park.cpp
@@ -919,7 +919,7 @@ static constexpr WindowParkAward _parkAwards[] = {
             DrawTextBasic(dpi, screenCoords, STR_INCOME_FROM_ADMISSIONS, ft);
 
             money64 parkEntranceFee = Park::GetEntranceFee();
-            auto stringId = parkEntranceFee == 0 ? STR_FREE : STR_BOTTOM_TOOLBAR_CASH;
+            auto stringId = parkEntranceFee == 0 ? EnumValue(STR_FREE) : EnumValue(STR_BOTTOM_TOOLBAR_CASH);
             screenCoords = windowPos + ScreenCoordsXY{ widgets[WIDX_PRICE].left + 1, widgets[WIDX_PRICE].top + 1 };
             ft = Formatter();
             ft.Add<money64>(parkEntranceFee);

diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp
@@ -7,8 +7,8 @@
  * OpenRCT2 is licensed under the GNU General Public License version 3.
  *****************************************************************************/
 
+#include "../UiStringIds.h"
 #include "../interface/Theme.h"
-#include "UiStringIds.h"
 
 #include <cmath>
 #include <iterator>
@@ -40,6 +40,8 @@
 #include <openrct2/entity/Staff.h>
 #include <openrct2/localisation/Date.h>
 #include <openrct2/localisation/Formatter.h>
+#include <openrct2/localisation/Localisation.h>
+#include <openrct2/localisation/LocalisationService.h>
 #include <openrct2/network/network.h>
 #include <openrct2/object/MusicObject.h>
 #include <openrct2/object/ObjectManager.h>

diff --git a/src/openrct2-ui/windows/Sign.cpp b/src/openrct2-ui/windows/Sign.cpp
@@ -7,7 +7,7 @@
  * OpenRCT2 is licensed under the GNU General Public License version 3.
  *****************************************************************************/
 
-#include "UiStringIds.h"
+#include "../UiStringIds.h"
 
 #include <openrct2-ui/interface/Dropdown.h>
 #include <openrct2-ui/interface/Viewport.h>

diff --git a/src/openrct2-ui/windows/TileInspector.cpp b/src/openrct2-ui/windows/TileInspector.cpp
@@ -7,7 +7,7 @@
  * OpenRCT2 is licensed under the GNU General Public License version 3.
  *****************************************************************************/
 
-#include "UiStringIds.h"
+#include "../UiStringIds.h"
 
 #include <iterator>
 #include <openrct2-ui/interface/Dropdown.h>

diff --git a/src/openrct2/localisation/StringIds.h b/src/openrct2/localisation/StringIds.h
@@ -14,7 +14,7 @@
 constexpr StringId STR_NONE = 0xFFFF;
 constexpr StringId STR_VIEWPORT = 0xFFFE;
 
-enum : uint16_t
+enum : StringId
 {
     STR_EMPTY = 0,
     STR_RIDE_NAME_DEFAULT = 1,
@@ -599,7 +599,6 @@ enum : uint16_t
     STR_CANT_CHANGE_THIS = 1746,
     // STR_1750    :{DURATION}
     STR_CANT_CHANGE_TIME_LIMIT = 1751,
-    STR_RIDE_CONSTRUCTION_BUILD_MAZE_IN_THIS_DIRECTION_TIP = 1761,
     STR_WATERFALLS = 1762,
     STR_RAPIDS = 1763,
     STR_ON_RIDE_PHOTO_SECTION = 1765,