From 2302f0d2e3028b071c17221f0cd0cc976c891796 Mon Sep 17 00:00:00 2001 From: Aaron van Geffen Date: Fri, 7 Feb 2025 22:36:42 +0100 Subject: [PATCH] Rework Localisation includes (#23789) * Clean up internal localisation header includes * Remove some external localisation includes * Remove dependency on FormatCodes.h from InteractiveConsole.h * Reduce Formatter.h, Localisation.Date.h includes --- src/openrct2-ui/WindowManager.cpp | 3 ++- src/openrct2-ui/input/MouseInput.cpp | 1 - src/openrct2-ui/input/ShortcutInput.cpp | 1 + src/openrct2-ui/input/ShortcutManager.cpp | 1 - src/openrct2-ui/interface/Window.cpp | 3 ++- src/openrct2-ui/scripting/CustomWindow.cpp | 1 - src/openrct2-ui/scripting/ScWindow.hpp | 1 - src/openrct2/Date.cpp | 2 -- src/openrct2/core/FileScanner.cpp | 7 +------ src/openrct2/core/Path.cpp | 1 - src/openrct2/entity/Staff.cpp | 1 - src/openrct2/interface/InteractiveConsole.h | 4 ++-- src/openrct2/interface/StdInOutConsole.cpp | 1 + src/openrct2/interface/Window.cpp | 6 ------ src/openrct2/localisation/Currency.cpp | 4 +++- src/openrct2/localisation/FormatCodes.cpp | 2 -- src/openrct2/localisation/FormatCodes.h | 3 ++- src/openrct2/localisation/Formatting.cpp | 1 + src/openrct2/localisation/Formatting.h | 4 ++-- src/openrct2/localisation/Language.cpp | 6 ------ src/openrct2/localisation/LanguagePack.cpp | 3 +-- src/openrct2/localisation/LocalisationService.cpp | 5 ----- src/openrct2/localisation/LocalisationService.h | 2 -- src/openrct2/management/Finance.cpp | 1 - src/openrct2/management/NewsItem.cpp | 1 - src/openrct2/management/Research.cpp | 1 - src/openrct2/object/EntranceObject.cpp | 2 +- src/openrct2/object/Object.cpp | 1 - src/openrct2/paint/Painter.cpp | 2 +- src/openrct2/paint/tile_element/Paint.SmallScenery.cpp | 1 - src/openrct2/park/ParkFile.cpp | 1 - src/openrct2/platform/Crash.cpp | 1 - src/openrct2/platform/Platform.Win32.cpp | 1 - src/openrct2/rct2/S6Importer.cpp | 1 - src/openrct2/ride/Ride.cpp | 1 - src/openrct2/ride/RideConstruction.cpp | 1 - src/openrct2/scenario/Scenario.cpp | 1 - src/openrct2/scenes/preloader/PreloaderScene.cpp | 1 - src/openrct2/scenes/title/TitleSequenceManager.cpp | 2 +- src/openrct2/scripting/bindings/world/ScDate.hpp | 1 - src/openrct2/ui/DummyWindowManager.cpp | 3 ++- src/openrct2/world/Climate.cpp | 1 - src/openrct2/world/Map.cpp | 1 - src/openrct2/world/map_generator/PngTerrainGenerator.cpp | 1 + test/tests/FormattingTests.cpp | 1 + 45 files changed, 25 insertions(+), 65 deletions(-) diff --git a/src/openrct2-ui/WindowManager.cpp b/src/openrct2-ui/WindowManager.cpp index f3d20760aa..fb3866a8e1 100644 --- a/src/openrct2-ui/WindowManager.cpp +++ b/src/openrct2-ui/WindowManager.cpp @@ -29,7 +29,6 @@ #include #include #include -#include #include #include #include @@ -41,6 +40,8 @@ using namespace OpenRCT2; using namespace OpenRCT2::Ui; using namespace OpenRCT2::Ui::Windows; +class Formatter; + namespace WindowCloseFlags { static constexpr uint32_t None = 0; diff --git a/src/openrct2-ui/input/MouseInput.cpp b/src/openrct2-ui/input/MouseInput.cpp index b25245dc1c..59446c8ba3 100644 --- a/src/openrct2-ui/input/MouseInput.cpp +++ b/src/openrct2-ui/input/MouseInput.cpp @@ -30,7 +30,6 @@ #include #include #include -#include #include #include #include diff --git a/src/openrct2-ui/input/ShortcutInput.cpp b/src/openrct2-ui/input/ShortcutInput.cpp index f49fe84bd6..9edea2eb97 100644 --- a/src/openrct2-ui/input/ShortcutInput.cpp +++ b/src/openrct2-ui/input/ShortcutInput.cpp @@ -14,6 +14,7 @@ #include #include #include +#include #include #include diff --git a/src/openrct2-ui/input/ShortcutManager.cpp b/src/openrct2-ui/input/ShortcutManager.cpp index 6029cea287..5d0e236c38 100644 --- a/src/openrct2-ui/input/ShortcutManager.cpp +++ b/src/openrct2-ui/input/ShortcutManager.cpp @@ -20,7 +20,6 @@ #include #include #include -#include #include using namespace OpenRCT2::Ui; diff --git a/src/openrct2-ui/interface/Window.cpp b/src/openrct2-ui/interface/Window.cpp index 3216a66a1c..82581ed108 100644 --- a/src/openrct2-ui/interface/Window.cpp +++ b/src/openrct2-ui/interface/Window.cpp @@ -26,11 +26,12 @@ #include #include #include -#include #include #include #include +class Formatter; + namespace OpenRCT2 { using namespace OpenRCT2::Ui; diff --git a/src/openrct2-ui/scripting/CustomWindow.cpp b/src/openrct2-ui/scripting/CustomWindow.cpp index 2a6a7de696..b226ac71c8 100644 --- a/src/openrct2-ui/scripting/CustomWindow.cpp +++ b/src/openrct2-ui/scripting/CustomWindow.cpp @@ -23,7 +23,6 @@ #include #include #include - #include #include #include #include diff --git a/src/openrct2-ui/scripting/ScWindow.hpp b/src/openrct2-ui/scripting/ScWindow.hpp index 4d620acc30..825eacab72 100644 --- a/src/openrct2-ui/scripting/ScWindow.hpp +++ b/src/openrct2-ui/scripting/ScWindow.hpp @@ -15,7 +15,6 @@ #include #include - #include #include namespace OpenRCT2::Scripting diff --git a/src/openrct2/Date.cpp b/src/openrct2/Date.cpp index f0e893d419..535011de00 100644 --- a/src/openrct2/Date.cpp +++ b/src/openrct2/Date.cpp @@ -9,11 +9,9 @@ #include "Date.h" -#include "Context.h" #include "Game.h" #include "GameState.h" #include "core/Guard.hpp" -#include "localisation/Localisation.Date.h" using namespace OpenRCT2; diff --git a/src/openrct2/core/FileScanner.cpp b/src/openrct2/core/FileScanner.cpp index 8eab4c1808..dba2fa71f0 100644 --- a/src/openrct2/core/FileScanner.cpp +++ b/src/openrct2/core/FileScanner.cpp @@ -9,16 +9,11 @@ #ifdef _WIN32 #include -#endif - -#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__)) +#elif defined(__unix__) || (defined(__APPLE__) && defined(__MACH__)) #include #include #include #include -#elif defined(_WIN32) - // Windows needs this for widechar <-> utf8 conversion utils - #include "../localisation/Language.h" #endif #include "FileScanner.h" diff --git a/src/openrct2/core/Path.cpp b/src/openrct2/core/Path.cpp index 3a9d488b87..4880ba99c0 100644 --- a/src/openrct2/core/Path.cpp +++ b/src/openrct2/core/Path.cpp @@ -9,7 +9,6 @@ #include "Path.hpp" -#include "../localisation/Language.h" #include "../platform/Platform.h" #include "File.h" #include "FileSystem.hpp" diff --git a/src/openrct2/entity/Staff.cpp b/src/openrct2/entity/Staff.cpp index 1ca293eeb3..071bc8f21a 100644 --- a/src/openrct2/entity/Staff.cpp +++ b/src/openrct2/entity/Staff.cpp @@ -20,7 +20,6 @@ #include "../core/EnumUtils.hpp" #include "../entity/EntityRegistry.h" #include "../interface/Viewport.h" -#include "../localisation/Localisation.Date.h" #include "../localisation/StringIds.h" #include "../management/Finance.h" #include "../network/network.h" diff --git a/src/openrct2/interface/InteractiveConsole.h b/src/openrct2/interface/InteractiveConsole.h index 3493283016..45ac4ee75e 100644 --- a/src/openrct2/interface/InteractiveConsole.h +++ b/src/openrct2/interface/InteractiveConsole.h @@ -9,8 +9,6 @@ #pragma once -#include "../localisation/FormatCodes.h" - #include #include #include @@ -18,6 +16,8 @@ struct DrawPixelInfo; struct TextInputSession; +enum class FormatToken : uint8_t; + enum class ConsoleInput : uint8_t { None, diff --git a/src/openrct2/interface/StdInOutConsole.cpp b/src/openrct2/interface/StdInOutConsole.cpp index c02470d215..069380fd32 100644 --- a/src/openrct2/interface/StdInOutConsole.cpp +++ b/src/openrct2/interface/StdInOutConsole.cpp @@ -12,6 +12,7 @@ #include "../Context.h" #include "../OpenRCT2.h" #include "../config/ConfigTypes.h" +#include "../localisation/FormatCodes.h" #include "../platform/Platform.h" #include "../scripting/ScriptEngine.h" diff --git a/src/openrct2/interface/Window.cpp b/src/openrct2/interface/Window.cpp index 377c7a0e6b..12952a1436 100644 --- a/src/openrct2/interface/Window.cpp +++ b/src/openrct2/interface/Window.cpp @@ -18,17 +18,11 @@ #include "../OpenRCT2.h" #include "../audio/audio.h" #include "../config/Config.h" -#include "../core/Guard.hpp" #include "../drawing/Drawing.h" #include "../interface/Cursors.h" -#include "../localisation/Formatting.h" -#include "../localisation/StringIds.h" -#include "../platform/Platform.h" #include "../ride/RideAudio.h" -#include "../scenario/Scenario.h" #include "../ui/UiContext.h" #include "../ui/WindowManager.h" -#include "../world/Map.h" #include "Viewport.h" #include "Widget.h" #include "Window_internal.h" diff --git a/src/openrct2/localisation/Currency.cpp b/src/openrct2/localisation/Currency.cpp index 5152c113eb..ba4c1108ae 100644 --- a/src/openrct2/localisation/Currency.cpp +++ b/src/openrct2/localisation/Currency.cpp @@ -13,9 +13,11 @@ #include "../core/EnumUtils.hpp" #include "../core/Guard.hpp" #include "../core/String.hpp" -#include "Formatting.h" +#include "Language.h" #include "StringIds.h" +#include + using namespace OpenRCT2; // clang-format off diff --git a/src/openrct2/localisation/FormatCodes.cpp b/src/openrct2/localisation/FormatCodes.cpp index 762e941113..0ccd9d6f0e 100644 --- a/src/openrct2/localisation/FormatCodes.cpp +++ b/src/openrct2/localisation/FormatCodes.cpp @@ -11,8 +11,6 @@ #include "../core/EnumMap.hpp" -#include - // clang-format off static const EnumMap FormatTokenMap = { { "MOVE_X", FormatToken::Move, }, diff --git a/src/openrct2/localisation/FormatCodes.h b/src/openrct2/localisation/FormatCodes.h index 479cb68aa6..e8980e7dc5 100644 --- a/src/openrct2/localisation/FormatCodes.h +++ b/src/openrct2/localisation/FormatCodes.h @@ -9,10 +9,11 @@ #pragma once +#include #include #include -enum class FormatToken +enum class FormatToken : uint8_t { Unknown, Literal, diff --git a/src/openrct2/localisation/Formatting.cpp b/src/openrct2/localisation/Formatting.cpp index 0df257b449..b90afb8c09 100644 --- a/src/openrct2/localisation/Formatting.cpp +++ b/src/openrct2/localisation/Formatting.cpp @@ -19,6 +19,7 @@ #include "Currency.h" #include "FormatCodes.h" #include "Formatter.h" +#include "Language.h" #include "Localisation.Date.h" #include "StringIds.h" diff --git a/src/openrct2/localisation/Formatting.h b/src/openrct2/localisation/Formatting.h index c507bb8129..9d40941948 100644 --- a/src/openrct2/localisation/Formatting.h +++ b/src/openrct2/localisation/Formatting.h @@ -9,11 +9,11 @@ #pragma once +#include "../core/StringTypes.h" #include "FormatCodes.h" -#include "Language.h" +#include "StringIdType.h" #include -#include #include #include #include diff --git a/src/openrct2/localisation/Language.cpp b/src/openrct2/localisation/Language.cpp index a7cf87d5c2..3a883a5096 100644 --- a/src/openrct2/localisation/Language.cpp +++ b/src/openrct2/localisation/Language.cpp @@ -8,18 +8,12 @@ *****************************************************************************/ #include "../Context.h" -#include "../core/Path.hpp" #include "../core/String.hpp" #include "../interface/FontFamilies.h" -#include "../interface/Fonts.h" #include "../interface/Window.h" #include "../object/ObjectManager.h" -#include "../platform/Platform.h" -#include "LanguagePack.h" #include "LocalisationService.h" -#include - using namespace OpenRCT2; // clang-format off diff --git a/src/openrct2/localisation/LanguagePack.cpp b/src/openrct2/localisation/LanguagePack.cpp index b5ea29252b..fe6d86498e 100644 --- a/src/openrct2/localisation/LanguagePack.cpp +++ b/src/openrct2/localisation/LanguagePack.cpp @@ -12,9 +12,8 @@ #include "../Context.h" #include "../Diagnostic.h" #include "../core/FileStream.h" -#include "../core/Memory.hpp" +#include "../core/Guard.hpp" #include "../core/RTL.h" -#include "../core/String.hpp" #include "../core/StringBuilder.h" #include "../core/StringReader.h" #include "Language.h" diff --git a/src/openrct2/localisation/LocalisationService.cpp b/src/openrct2/localisation/LocalisationService.cpp index b5a702db94..14208979fb 100644 --- a/src/openrct2/localisation/LocalisationService.cpp +++ b/src/openrct2/localisation/LocalisationService.cpp @@ -11,15 +11,10 @@ #include "../Context.h" #include "../PlatformEnvironment.h" -#include "../core/Guard.hpp" #include "../core/Path.hpp" #include "../interface/Fonts.h" -#include "../object/ObjectManager.h" #include "Language.h" #include "LanguagePack.h" -#include "StringIds.h" - -#include using namespace OpenRCT2; using namespace OpenRCT2::Localisation; diff --git a/src/openrct2/localisation/LocalisationService.h b/src/openrct2/localisation/LocalisationService.h index db00419fb8..eb63644d77 100644 --- a/src/openrct2/localisation/LocalisationService.h +++ b/src/openrct2/localisation/LocalisationService.h @@ -9,14 +9,12 @@ #pragma once -#include "../core/StringTypes.h" #include "../localisation/StringIdType.h" #include #include #include #include -#include #include struct ILanguagePack; diff --git a/src/openrct2/management/Finance.cpp b/src/openrct2/management/Finance.cpp index d4b1a7fa7e..8e70a904ee 100644 --- a/src/openrct2/management/Finance.cpp +++ b/src/openrct2/management/Finance.cpp @@ -16,7 +16,6 @@ #include "../core/EnumUtils.hpp" #include "../entity/Peep.h" #include "../entity/Staff.h" -#include "../localisation/Localisation.Date.h" #include "../profiling/Profiling.h" #include "../ride/Ride.h" #include "../ride/RideManager.hpp" diff --git a/src/openrct2/management/NewsItem.cpp b/src/openrct2/management/NewsItem.cpp index d176ee00e2..6d4b785605 100644 --- a/src/openrct2/management/NewsItem.cpp +++ b/src/openrct2/management/NewsItem.cpp @@ -19,7 +19,6 @@ #include "../entity/Peep.h" #include "../localisation/Formatter.h" #include "../localisation/Formatting.h" -#include "../localisation/Localisation.Date.h" #include "../management/Research.h" #include "../profiling/Profiling.h" #include "../ride/Ride.h" diff --git a/src/openrct2/management/Research.cpp b/src/openrct2/management/Research.cpp index 5027ad67be..f4665c0be9 100644 --- a/src/openrct2/management/Research.cpp +++ b/src/openrct2/management/Research.cpp @@ -22,7 +22,6 @@ #include "../core/Guard.hpp" #include "../core/Memory.hpp" #include "../localisation/Formatter.h" -#include "../localisation/Localisation.Date.h" #include "../localisation/StringIds.h" #include "../object/ObjectEntryManager.h" #include "../object/ObjectLimits.h" diff --git a/src/openrct2/object/EntranceObject.cpp b/src/openrct2/object/EntranceObject.cpp index acab82bdea..69b38376fe 100644 --- a/src/openrct2/object/EntranceObject.cpp +++ b/src/openrct2/object/EntranceObject.cpp @@ -14,7 +14,7 @@ #include "../core/Json.hpp" #include "../core/String.hpp" #include "../drawing/Drawing.h" -#include "../localisation/LocalisationService.h" +#include "../localisation/Language.h" #include "../paint/tile_element/Paint.TileElement.h" using namespace OpenRCT2; diff --git a/src/openrct2/object/Object.cpp b/src/openrct2/object/Object.cpp index 036370c030..e33ddd1011 100644 --- a/src/openrct2/object/Object.cpp +++ b/src/openrct2/object/Object.cpp @@ -18,7 +18,6 @@ #include "../core/ZipStream.hpp" #include "../drawing/Image.h" #include "../localisation/Language.h" -#include "../localisation/LocalisationService.h" #include "../localisation/StringIds.h" #include "../world/Scenery.h" #include "ObjectLimits.h" diff --git a/src/openrct2/paint/Painter.cpp b/src/openrct2/paint/Painter.cpp index 2776b271a9..23fb5f87e5 100644 --- a/src/openrct2/paint/Painter.cpp +++ b/src/openrct2/paint/Painter.cpp @@ -13,10 +13,10 @@ #include "../OpenRCT2.h" #include "../ReplayManager.h" #include "../config/Config.h" +#include "../core/Guard.hpp" #include "../drawing/IDrawingEngine.h" #include "../drawing/Text.h" #include "../localisation/Formatting.h" -#include "../localisation/Language.h" #include "../paint/Paint.h" #include "../profiling/Profiling.h" #include "../scenes/intro/IntroScene.h" diff --git a/src/openrct2/paint/tile_element/Paint.SmallScenery.cpp b/src/openrct2/paint/tile_element/Paint.SmallScenery.cpp index 5fe7f40cbe..0417b75fc0 100644 --- a/src/openrct2/paint/tile_element/Paint.SmallScenery.cpp +++ b/src/openrct2/paint/tile_element/Paint.SmallScenery.cpp @@ -13,7 +13,6 @@ #include "../../GameState.h" #include "../../core/EnumUtils.hpp" #include "../../interface/Viewport.h" -#include "../../localisation/Localisation.Date.h" #include "../../object/SmallSceneryEntry.h" #include "../../profiling/Profiling.h" #include "../../ride/TrackDesign.h" diff --git a/src/openrct2/park/ParkFile.cpp b/src/openrct2/park/ParkFile.cpp index 291ae5b656..41c09c972e 100644 --- a/src/openrct2/park/ParkFile.cpp +++ b/src/openrct2/park/ParkFile.cpp @@ -36,7 +36,6 @@ #include "../entity/PatrolArea.h" #include "../entity/Staff.h" #include "../interface/Viewport.h" -#include "../localisation/Localisation.Date.h" #include "../management/Award.h" #include "../management/Finance.h" #include "../management/NewsItem.h" diff --git a/src/openrct2/platform/Crash.cpp b/src/openrct2/platform/Crash.cpp index 384af0c976..0bd22e39d0 100644 --- a/src/openrct2/platform/Crash.cpp +++ b/src/openrct2/platform/Crash.cpp @@ -39,7 +39,6 @@ #include "../core/String.hpp" #include "../drawing/IDrawingEngine.h" #include "../interface/Screenshot.h" - #include "../localisation/Language.h" #include "../object/ObjectManager.h" #include "../park/ParkFile.h" #include "../scenario/Scenario.h" diff --git a/src/openrct2/platform/Platform.Win32.cpp b/src/openrct2/platform/Platform.Win32.cpp index e0bad458be..ed965b0ef1 100644 --- a/src/openrct2/platform/Platform.Win32.cpp +++ b/src/openrct2/platform/Platform.Win32.cpp @@ -32,7 +32,6 @@ #include "../core/Path.hpp" #include "../core/String.hpp" #include "../localisation/Language.h" - #include "../localisation/Localisation.Date.h" #include "Platform.h" #include diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index cc5af8ced0..a8711edfd0 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -38,7 +38,6 @@ #include "../entity/Staff.h" #include "../interface/Viewport.h" #include "../localisation/Formatting.h" -#include "../localisation/Localisation.Date.h" #include "../management/Award.h" #include "../management/Finance.h" #include "../management/Marketing.h" diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index 186a73e420..de131f3377 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -35,7 +35,6 @@ #include "../interface/Window_internal.h" #include "../localisation/Formatter.h" #include "../localisation/Formatting.h" -#include "../localisation/Localisation.Date.h" #include "../management/Finance.h" #include "../management/Marketing.h" #include "../management/NewsItem.h" diff --git a/src/openrct2/ride/RideConstruction.cpp b/src/openrct2/ride/RideConstruction.cpp index b0a8ba2814..8423c8df05 100644 --- a/src/openrct2/ride/RideConstruction.cpp +++ b/src/openrct2/ride/RideConstruction.cpp @@ -23,7 +23,6 @@ #include "../entity/Staff.h" #include "../interface/Window_internal.h" #include "../localisation/Formatter.h" -#include "../localisation/Localisation.Date.h" #include "../network/network.h" #include "../ui/WindowManager.h" #include "../windows/Intent.h" diff --git a/src/openrct2/scenario/Scenario.cpp b/src/openrct2/scenario/Scenario.cpp index 2b243429c2..de61f92105 100644 --- a/src/openrct2/scenario/Scenario.cpp +++ b/src/openrct2/scenario/Scenario.cpp @@ -31,7 +31,6 @@ #include "../entity/Guest.h" #include "../entity/Staff.h" #include "../interface/Viewport.h" -#include "../localisation/Localisation.Date.h" #include "../management/Award.h" #include "../management/Finance.h" #include "../management/Marketing.h" diff --git a/src/openrct2/scenes/preloader/PreloaderScene.cpp b/src/openrct2/scenes/preloader/PreloaderScene.cpp index 21bd3856fa..4a3f218f79 100644 --- a/src/openrct2/scenes/preloader/PreloaderScene.cpp +++ b/src/openrct2/scenes/preloader/PreloaderScene.cpp @@ -16,7 +16,6 @@ #include "../../OpenRCT2.h" #include "../../audio/audio.h" #include "../../interface/Viewport.h" -#include "../../localisation/LocalisationService.h" #include "../../localisation/StringIds.h" #include "../../ui/WindowManager.h" #include "../../windows/Intent.h" diff --git a/src/openrct2/scenes/title/TitleSequenceManager.cpp b/src/openrct2/scenes/title/TitleSequenceManager.cpp index 50ca4a3d9e..d8c3f2a84d 100644 --- a/src/openrct2/scenes/title/TitleSequenceManager.cpp +++ b/src/openrct2/scenes/title/TitleSequenceManager.cpp @@ -18,8 +18,8 @@ #include "../../core/Memory.hpp" #include "../../core/Path.hpp" #include "../../core/String.hpp" +#include "../../localisation/Language.h" #include "../../localisation/StringIds.h" -#include "../../platform/Platform.h" #include "TitleSequence.h" #include diff --git a/src/openrct2/scripting/bindings/world/ScDate.hpp b/src/openrct2/scripting/bindings/world/ScDate.hpp index 8b3c9ea7b3..be762bd62e 100644 --- a/src/openrct2/scripting/bindings/world/ScDate.hpp +++ b/src/openrct2/scripting/bindings/world/ScDate.hpp @@ -15,7 +15,6 @@ #include "../../../Date.h" #include "../../../Game.h" #include "../../../GameState.h" - #include "../../../localisation/Localisation.Date.h" #include "../../Duktape.hpp" #include "../../ScriptEngine.h" diff --git a/src/openrct2/ui/DummyWindowManager.cpp b/src/openrct2/ui/DummyWindowManager.cpp index 0d72f45076..c389e20dc2 100644 --- a/src/openrct2/ui/DummyWindowManager.cpp +++ b/src/openrct2/ui/DummyWindowManager.cpp @@ -7,9 +7,10 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "../localisation/Formatter.h" #include "WindowManager.h" +class Formatter; + namespace OpenRCT2::Ui { class DummyWindowManager final : public IWindowManager diff --git a/src/openrct2/world/Climate.cpp b/src/openrct2/world/Climate.cpp index 4fa8841158..30c1f33262 100644 --- a/src/openrct2/world/Climate.cpp +++ b/src/openrct2/world/Climate.cpp @@ -20,7 +20,6 @@ #include "../config/Config.h" #include "../core/EnumUtils.hpp" #include "../drawing/Drawing.h" -#include "../localisation/Localisation.Date.h" #include "../profiling/Profiling.h" #include "../scenario/Scenario.h" #include "../sprites.h" diff --git a/src/openrct2/world/Map.cpp b/src/openrct2/world/Map.cpp index 76e10243eb..f538567d6e 100644 --- a/src/openrct2/world/Map.cpp +++ b/src/openrct2/world/Map.cpp @@ -30,7 +30,6 @@ #include "../entity/Staff.h" #include "../interface/Cursors.h" #include "../interface/Viewport.h" -#include "../localisation/Localisation.Date.h" #include "../management/Finance.h" #include "../network/network.h" #include "../object/LargeSceneryEntry.h" diff --git a/src/openrct2/world/map_generator/PngTerrainGenerator.cpp b/src/openrct2/world/map_generator/PngTerrainGenerator.cpp index 5a0dd90fa6..31cd3096b2 100644 --- a/src/openrct2/world/map_generator/PngTerrainGenerator.cpp +++ b/src/openrct2/world/map_generator/PngTerrainGenerator.cpp @@ -11,6 +11,7 @@ #include "../../Context.h" #include "../../Diagnostic.h" +#include "../../core/Guard.hpp" #include "../../core/Imaging.h" #include "../../localisation/Formatter.h" #include "../../localisation/StringIds.h" diff --git a/test/tests/FormattingTests.cpp b/test/tests/FormattingTests.cpp index f631b1d5ae..a6bacbd58d 100644 --- a/test/tests/FormattingTests.cpp +++ b/test/tests/FormattingTests.cpp @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include