diff --git a/src/openrct2-ui/windows/Cheats.cpp b/src/openrct2-ui/windows/Cheats.cpp index 4b5e9e881b..75df3872b8 100644 --- a/src/openrct2-ui/windows/Cheats.cpp +++ b/src/openrct2-ui/windows/Cheats.cpp @@ -17,7 +17,6 @@ #include #include #include -#include #include #include #include diff --git a/src/openrct2-ui/windows/CustomCurrency.cpp b/src/openrct2-ui/windows/CustomCurrency.cpp index 25960fc494..03cef746b4 100644 --- a/src/openrct2-ui/windows/CustomCurrency.cpp +++ b/src/openrct2-ui/windows/CustomCurrency.cpp @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Finances.cpp b/src/openrct2-ui/windows/Finances.cpp index a35712ceb7..df1f816c91 100644 --- a/src/openrct2-ui/windows/Finances.cpp +++ b/src/openrct2-ui/windows/Finances.cpp @@ -16,7 +16,6 @@ #include #include #include -#include #include #include #include diff --git a/src/openrct2-ui/windows/GuestList.cpp b/src/openrct2-ui/windows/GuestList.cpp index 8770ed1210..b5c7b4cd25 100644 --- a/src/openrct2-ui/windows/GuestList.cpp +++ b/src/openrct2-ui/windows/GuestList.cpp @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include diff --git a/src/openrct2-ui/windows/RideList.cpp b/src/openrct2-ui/windows/RideList.cpp index 0022ef62db..73f5ad8f2a 100644 --- a/src/openrct2-ui/windows/RideList.cpp +++ b/src/openrct2-ui/windows/RideList.cpp @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include diff --git a/src/openrct2-ui/windows/TextInput.cpp b/src/openrct2-ui/windows/TextInput.cpp index 43e61be79f..b6a4407ba1 100644 --- a/src/openrct2-ui/windows/TextInput.cpp +++ b/src/openrct2-ui/windows/TextInput.cpp @@ -13,7 +13,6 @@ #include #include #include -#include #include #include #include diff --git a/src/openrct2-ui/windows/Themes.cpp b/src/openrct2-ui/windows/Themes.cpp index 52958a812c..944825bb4b 100644 --- a/src/openrct2-ui/windows/Themes.cpp +++ b/src/openrct2-ui/windows/Themes.cpp @@ -15,7 +15,6 @@ #include #include #include -#include #include #include #include diff --git a/src/openrct2-ui/windows/TitleExit.cpp b/src/openrct2-ui/windows/TitleExit.cpp index 8f08fe9280..9c70018115 100644 --- a/src/openrct2-ui/windows/TitleExit.cpp +++ b/src/openrct2-ui/windows/TitleExit.cpp @@ -10,7 +10,6 @@ #include #include #include -#include #include #include diff --git a/src/openrct2-ui/windows/TitleMenu.cpp b/src/openrct2-ui/windows/TitleMenu.cpp index e506ac4cf1..d49a5eb53c 100644 --- a/src/openrct2-ui/windows/TitleMenu.cpp +++ b/src/openrct2-ui/windows/TitleMenu.cpp @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include diff --git a/src/openrct2-ui/windows/TitleOptions.cpp b/src/openrct2-ui/windows/TitleOptions.cpp index cbde63d877..9693256075 100644 --- a/src/openrct2-ui/windows/TitleOptions.cpp +++ b/src/openrct2-ui/windows/TitleOptions.cpp @@ -10,7 +10,6 @@ #include #include #include -#include #include namespace OpenRCT2::Ui::Windows diff --git a/src/openrct2/Cheats.cpp b/src/openrct2/Cheats.cpp index 6c14cd65c4..1ae25bba5d 100644 --- a/src/openrct2/Cheats.cpp +++ b/src/openrct2/Cheats.cpp @@ -12,7 +12,6 @@ #include "GameState.h" #include "actions/CheatSetAction.h" #include "actions/ParkSetLoanAction.h" -#include "config/Config.h" #include "core/DataSerialiser.h" #include "localisation/Localisation.h" #include "network/network.h" diff --git a/src/openrct2/PlatformEnvironment.cpp b/src/openrct2/PlatformEnvironment.cpp index 025695715a..4924311d12 100644 --- a/src/openrct2/PlatformEnvironment.cpp +++ b/src/openrct2/PlatformEnvironment.cpp @@ -15,6 +15,7 @@ #include "core/Path.hpp" #include "core/String.hpp" #include "platform/Platform.h" +#include "util/Util.h" using namespace OpenRCT2; diff --git a/src/openrct2/actions/ParkSetNameAction.cpp b/src/openrct2/actions/ParkSetNameAction.cpp index 668aa52dfb..57a9424a38 100644 --- a/src/openrct2/actions/ParkSetNameAction.cpp +++ b/src/openrct2/actions/ParkSetNameAction.cpp @@ -11,7 +11,6 @@ #include "../Context.h" #include "../GameState.h" -#include "../config/Config.h" #include "../core/MemoryStream.h" #include "../drawing/Drawing.h" #include "../localisation/Localisation.h" diff --git a/src/openrct2/command_line/CommandLine.cpp b/src/openrct2/command_line/CommandLine.cpp index 3a204a7eb4..da05376047 100644 --- a/src/openrct2/command_line/CommandLine.cpp +++ b/src/openrct2/command_line/CommandLine.cpp @@ -12,6 +12,7 @@ #include "../OpenRCT2.h" #include "../core/Console.hpp" #include "../core/String.hpp" +#include "../drawing/Font.h" #include "../platform/Platform.h" #include diff --git a/src/openrct2/command_line/SimulateCommands.cpp b/src/openrct2/command_line/SimulateCommands.cpp index 9c6d3253a6..a1a39de33e 100644 --- a/src/openrct2/command_line/SimulateCommands.cpp +++ b/src/openrct2/command_line/SimulateCommands.cpp @@ -11,6 +11,7 @@ #include "../Game.h" #include "../GameState.h" #include "../OpenRCT2.h" +#include "../config/ConfigTypes.h" #include "../core/Console.hpp" #include "../entity/EntityRegistry.h" #include "../network/network.h" diff --git a/src/openrct2/config/Config.h b/src/openrct2/config/Config.h index 391b56fcb8..8206ed3602 100644 --- a/src/openrct2/config/Config.h +++ b/src/openrct2/config/Config.h @@ -10,19 +10,13 @@ #pragma once #include "../core/String.hpp" -#include "../drawing/Drawing.h" -#include "../localisation/Currency.h" +#include "../localisation/CurrencyTypes.h" +#include "ConfigTypes.h" #include #include -enum class MeasurementFormat : int32_t; -enum class TemperatureUnit : int32_t; -enum class ScaleQuality : int32_t; -enum class Sort : int32_t; -enum class VirtualFloorStyles : int32_t; -enum class DrawingEngine : int32_t; -enum class TitleMusicKind : int32_t; +struct Gx; struct GeneralConfiguration { @@ -221,43 +215,6 @@ struct PluginConfiguration u8string AllowedHosts; }; -enum class Sort : int32_t -{ - NameAscending, - NameDescending, - DateAscending, - DateDescending, -}; - -enum class TemperatureUnit : int32_t -{ - Celsius, - Fahrenheit -}; - -enum class ScaleQuality : int32_t -{ - NearestNeighbour, - Linear, - SmoothNearestNeighbour -}; - -enum class MeasurementFormat : int32_t -{ - Imperial, - Metric, - SI -}; - -enum class TitleMusicKind : int32_t -{ - None, - Random, - OpenRCT2, - RCT1, - RCT2, -}; - extern GeneralConfiguration gConfigGeneral; extern InterfaceConfiguration gConfigInterface; extern SoundConfiguration gConfigSound; diff --git a/src/openrct2/config/ConfigTypes.h b/src/openrct2/config/ConfigTypes.h new file mode 100644 index 0000000000..2d8f4fd8f3 --- /dev/null +++ b/src/openrct2/config/ConfigTypes.h @@ -0,0 +1,58 @@ +/***************************************************************************** + * Copyright (c) 2014-2024 OpenRCT2 developers + * + * For a complete list of all authors, please refer to contributors.md + * Interested in contributing? Visit https://github.com/OpenRCT2/OpenRCT2 + * + * OpenRCT2 is licensed under the GNU General Public License version 3. + *****************************************************************************/ + +#pragma once + +#include + +enum class MeasurementFormat : int32_t; +enum class TemperatureUnit : int32_t; +enum class CurrencyType : uint8_t; +enum class ScaleQuality : int32_t; +enum class Sort : int32_t; +enum class VirtualFloorStyles : int32_t; +enum class DrawingEngine : int32_t; +enum class TitleMusicKind : int32_t; + +enum class Sort : int32_t +{ + NameAscending, + NameDescending, + DateAscending, + DateDescending, +}; + +enum class TemperatureUnit : int32_t +{ + Celsius, + Fahrenheit +}; + +enum class ScaleQuality : int32_t +{ + NearestNeighbour, + Linear, + SmoothNearestNeighbour +}; + +enum class MeasurementFormat : int32_t +{ + Imperial, + Metric, + SI +}; + +enum class TitleMusicKind : int32_t +{ + None, + Random, + OpenRCT2, + RCT1, + RCT2, +}; diff --git a/src/openrct2/drawing/NewDrawing.cpp b/src/openrct2/drawing/NewDrawing.cpp index 03399e1ed1..432e1da579 100644 --- a/src/openrct2/drawing/NewDrawing.cpp +++ b/src/openrct2/drawing/NewDrawing.cpp @@ -10,7 +10,6 @@ #include "NewDrawing.h" #include "../Context.h" -#include "../config/Config.h" #include "../drawing/Drawing.h" #include "../interface/Screenshot.h" #include "../localisation/StringIds.h" diff --git a/src/openrct2/drawing/TTF.cpp b/src/openrct2/drawing/TTF.cpp index 65f27c8569..07a17a580b 100644 --- a/src/openrct2/drawing/TTF.cpp +++ b/src/openrct2/drawing/TTF.cpp @@ -19,8 +19,10 @@ # include "../OpenRCT2.h" # include "../core/Numerics.hpp" # include "../core/String.hpp" +# include "../drawing/Font.h" # include "../localisation/LocalisationService.h" # include "../platform/Platform.h" +# include "../util/Util.h" # include "DrawingLock.hpp" # include "TTF.h" diff --git a/src/openrct2/entity/Staff.cpp b/src/openrct2/entity/Staff.cpp index 1928121cd8..cb4beb4dfa 100644 --- a/src/openrct2/entity/Staff.cpp +++ b/src/openrct2/entity/Staff.cpp @@ -15,7 +15,6 @@ #include "../Input.h" #include "../actions/StaffSetOrdersAction.h" #include "../audio/audio.h" -#include "../config/Config.h" #include "../core/DataSerialiser.h" #include "../entity/EntityRegistry.h" #include "../interface/Viewport.h" diff --git a/src/openrct2/interface/Screenshot.cpp b/src/openrct2/interface/Screenshot.cpp index be4a36bb98..54292df549 100644 --- a/src/openrct2/interface/Screenshot.cpp +++ b/src/openrct2/interface/Screenshot.cpp @@ -16,6 +16,7 @@ #include "../PlatformEnvironment.h" #include "../actions/CheatSetAction.h" #include "../audio/audio.h" +#include "../config/Config.h" #include "../core/Console.hpp" #include "../core/File.h" #include "../core/Imaging.h" diff --git a/src/openrct2/interface/StdInOutConsole.cpp b/src/openrct2/interface/StdInOutConsole.cpp index 145870ad51..f5050348ad 100644 --- a/src/openrct2/interface/StdInOutConsole.cpp +++ b/src/openrct2/interface/StdInOutConsole.cpp @@ -11,6 +11,7 @@ #include "../Context.h" #include "../OpenRCT2.h" +#include "../config/ConfigTypes.h" #include "../platform/Platform.h" #include "../scripting/ScriptEngine.h" diff --git a/src/openrct2/libopenrct2.vcxproj b/src/openrct2/libopenrct2.vcxproj index 8400f87aa6..3ab6981da5 100644 --- a/src/openrct2/libopenrct2.vcxproj +++ b/src/openrct2/libopenrct2.vcxproj @@ -176,6 +176,7 @@ + @@ -278,6 +279,7 @@ + diff --git a/src/openrct2/localisation/Currency.h b/src/openrct2/localisation/Currency.h index 7ad966e0c9..4928dd77fb 100644 --- a/src/openrct2/localisation/Currency.h +++ b/src/openrct2/localisation/Currency.h @@ -12,38 +12,7 @@ #include "../common.h" #include "../core/String.hpp" #include "../util/Util.h" - -// List of currencies -enum class CurrencyType : uint8_t -{ - Pounds, // British Pound - Dollars, // US Dollar - Franc, // French Franc - DeutscheMark, // Deutsche Mark - Yen, // Japanese Yen - Peseta, // Spanish Peseta - Lira, // Italian Lira - Guilders, // Dutch Gilder - Krona, // Swedish Krona - Euros, // Euro - Won, // South Korean Won - Rouble, // Russian Rouble - CzechKoruna, // Czech koruna - HKD, // Hong Kong Dollar - TWD, // New Taiwan Dollar - Yuan, // Chinese Yuan - Forint, // Hungarian Forint - - Custom, // Custom currency - - Count // Last item -}; - -enum class CurrencyAffix -{ - Prefix, - Suffix -}; +#include "CurrencyTypes.h" #define CURRENCY_SYMBOL_MAX_SIZE 8 #define CURRENCY_RATE_MAX_NUM_DIGITS 9 @@ -62,6 +31,7 @@ struct CurrencyDescriptor }; // List of currency formats +// TODO: refactor into getter extern CurrencyDescriptor CurrencyDescriptors[EnumValue(CurrencyType::Count)]; /** diff --git a/src/openrct2/localisation/CurrencyTypes.h b/src/openrct2/localisation/CurrencyTypes.h new file mode 100644 index 0000000000..5c1a6ee976 --- /dev/null +++ b/src/openrct2/localisation/CurrencyTypes.h @@ -0,0 +1,44 @@ +/***************************************************************************** + * Copyright (c) 2014-2024 OpenRCT2 developers + * + * For a complete list of all authors, please refer to contributors.md + * Interested in contributing? Visit https://github.com/OpenRCT2/OpenRCT2 + * + * OpenRCT2 is licensed under the GNU General Public License version 3. + *****************************************************************************/ + +#pragma once + +#include + +// List of currencies +enum class CurrencyType : uint8_t +{ + Pounds, // British Pound + Dollars, // US Dollar + Franc, // French Franc + DeutscheMark, // Deutsche Mark + Yen, // Japanese Yen + Peseta, // Spanish Peseta + Lira, // Italian Lira + Guilders, // Dutch Gilder + Krona, // Swedish Krona + Euros, // Euro + Won, // South Korean Won + Rouble, // Russian Rouble + CzechKoruna, // Czech koruna + HKD, // Hong Kong Dollar + TWD, // New Taiwan Dollar + Yuan, // Chinese Yuan + Forint, // Hungarian Forint + + Custom, // Custom currency + + Count // Last item +}; + +enum class CurrencyAffix +{ + Prefix, + Suffix +}; diff --git a/src/openrct2/localisation/Formatting.cpp b/src/openrct2/localisation/Formatting.cpp index 42d7b3faa1..dc304655ea 100644 --- a/src/openrct2/localisation/Formatting.cpp +++ b/src/openrct2/localisation/Formatting.cpp @@ -11,6 +11,7 @@ #include "../config/Config.h" #include "../util/Util.h" +#include "Currency.h" #include "Formatter.h" #include "Localisation.h" #include "StringIds.h" diff --git a/src/openrct2/localisation/Localisation.cpp b/src/openrct2/localisation/Localisation.cpp index 367c4a5682..b350c7be57 100644 --- a/src/openrct2/localisation/Localisation.cpp +++ b/src/openrct2/localisation/Localisation.cpp @@ -26,6 +26,7 @@ #include "../management/Marketing.h" #include "../ride/Ride.h" #include "../util/Util.h" +#include "Currency.h" #include "Date.h" #include "Formatting.h" #include "Localisation.h" diff --git a/src/openrct2/localisation/Localisation.h b/src/openrct2/localisation/Localisation.h index fe9da9f781..d8355669ba 100644 --- a/src/openrct2/localisation/Localisation.h +++ b/src/openrct2/localisation/Localisation.h @@ -10,7 +10,6 @@ #pragma once #include "../management/Marketing.h" -#include "Currency.h" #include "Date.h" #include "FormatCodes.h" #include "Language.h" diff --git a/src/openrct2/object/ObjectRepository.cpp b/src/openrct2/object/ObjectRepository.cpp index 471dcf6562..402104d41a 100644 --- a/src/openrct2/object/ObjectRepository.cpp +++ b/src/openrct2/object/ObjectRepository.cpp @@ -13,7 +13,6 @@ #include "../OpenRCT2.h" #include "../PlatformEnvironment.h" #include "../common.h" -#include "../config/Config.h" #include "../core/Console.hpp" #include "../core/DataSerialiser.h" #include "../core/FileIndex.hpp" diff --git a/src/openrct2/paint/Paint.cpp b/src/openrct2/paint/Paint.cpp index ab2b7269f4..9aa72628c1 100644 --- a/src/openrct2/paint/Paint.cpp +++ b/src/openrct2/paint/Paint.cpp @@ -14,6 +14,7 @@ #include "../core/Guard.hpp" #include "../drawing/Drawing.h" #include "../interface/Viewport.h" +#include "../localisation/Currency.h" #include "../localisation/Formatting.h" #include "../localisation/Localisation.h" #include "../localisation/LocalisationService.h" diff --git a/src/openrct2/paint/tile_element/Paint.SmallScenery.cpp b/src/openrct2/paint/tile_element/Paint.SmallScenery.cpp index 3ccf8978d6..17f1c507f8 100644 --- a/src/openrct2/paint/tile_element/Paint.SmallScenery.cpp +++ b/src/openrct2/paint/tile_element/Paint.SmallScenery.cpp @@ -11,7 +11,6 @@ #include "../../Game.h" #include "../../GameState.h" -#include "../../config/Config.h" #include "../../interface/Viewport.h" #include "../../localisation/Date.h" #include "../../object/SmallSceneryEntry.h" diff --git a/src/openrct2/platform/Platform.Common.cpp b/src/openrct2/platform/Platform.Common.cpp index ba8579c6af..b285dd0c76 100644 --- a/src/openrct2/platform/Platform.Common.cpp +++ b/src/openrct2/platform/Platform.Common.cpp @@ -16,9 +16,9 @@ #include "../Context.h" #include "../Game.h" -#include "../config/Config.h" #include "../core/File.h" #include "../core/Path.hpp" +#include "../localisation/Currency.h" #include "../localisation/Localisation.h" #include "Platform.h" diff --git a/src/openrct2/platform/Platform.Posix.cpp b/src/openrct2/platform/Platform.Posix.cpp index f34dd70d00..5dd3418831 100644 --- a/src/openrct2/platform/Platform.Posix.cpp +++ b/src/openrct2/platform/Platform.Posix.cpp @@ -14,7 +14,6 @@ # include "../Date.h" # include "../core/Memory.hpp" # include "../core/Path.hpp" -# include "../core/String.hpp" # include "../util/Util.h" # include diff --git a/src/openrct2/platform/Platform.h b/src/openrct2/platform/Platform.h index 81312e6f3c..5b9cf6f913 100644 --- a/src/openrct2/platform/Platform.h +++ b/src/openrct2/platform/Platform.h @@ -10,7 +10,8 @@ #pragma once #include "../common.h" -#include "../config/Config.h" +#include "../config/ConfigTypes.h" +#include "../core/String.hpp" #include #include @@ -42,6 +43,7 @@ enum class SPECIAL_FOLDER struct RealWorldDate; struct RealWorldTime; +struct TTFFontDescriptor; namespace Platform { diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index eb9592f5ba..297419a54f 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -14,7 +14,6 @@ #include "../GameState.h" #include "../OpenRCT2.h" #include "../ParkImporter.h" -#include "../config/Config.h" #include "../core/Console.hpp" #include "../core/FileStream.h" #include "../core/IStream.hpp" diff --git a/src/openrct2/rct2/T6Importer.cpp b/src/openrct2/rct2/T6Importer.cpp index 9483eaea04..14942e6cb0 100644 --- a/src/openrct2/rct2/T6Importer.cpp +++ b/src/openrct2/rct2/T6Importer.cpp @@ -8,7 +8,6 @@ *****************************************************************************/ #include "../TrackImporter.h" -#include "../config/Config.h" #include "../core/FileStream.h" #include "../core/MemoryStream.h" #include "../core/Path.hpp" diff --git a/src/openrct2/ride/TrackDesignRepository.cpp b/src/openrct2/ride/TrackDesignRepository.cpp index f353513202..0e6c0ce3d7 100644 --- a/src/openrct2/ride/TrackDesignRepository.cpp +++ b/src/openrct2/ride/TrackDesignRepository.cpp @@ -11,7 +11,6 @@ #include "../Context.h" #include "../PlatformEnvironment.h" -#include "../config/Config.h" #include "../core/Collections.hpp" #include "../core/Console.hpp" #include "../core/File.h" diff --git a/src/openrct2/ride/TrackDesignSave.cpp b/src/openrct2/ride/TrackDesignSave.cpp index c7dd604c9d..4ef8ae29d7 100644 --- a/src/openrct2/ride/TrackDesignSave.cpp +++ b/src/openrct2/ride/TrackDesignSave.cpp @@ -10,7 +10,6 @@ #include "../Context.h" #include "../Game.h" #include "../audio/audio.h" -#include "../config/Config.h" #include "../interface/Viewport.h" #include "../localisation/Localisation.h" #include "../localisation/StringIds.h" diff --git a/src/openrct2/ride/gentle/MiniGolf.cpp b/src/openrct2/ride/gentle/MiniGolf.cpp index 05b685b6ca..087598df11 100644 --- a/src/openrct2/ride/gentle/MiniGolf.cpp +++ b/src/openrct2/ride/gentle/MiniGolf.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "../../config/Config.h" #include "../../entity/EntityRegistry.h" #include "../../entity/Guest.h" #include "../../interface/Viewport.h" diff --git a/src/openrct2/ride/thrill/LaunchedFreefall.cpp b/src/openrct2/ride/thrill/LaunchedFreefall.cpp index 93cb7cdb1d..22c95c3ef0 100644 --- a/src/openrct2/ride/thrill/LaunchedFreefall.cpp +++ b/src/openrct2/ride/thrill/LaunchedFreefall.cpp @@ -8,7 +8,6 @@ *****************************************************************************/ #include "../../common.h" -#include "../../config/Config.h" #include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/support/WoodenSupports.h" diff --git a/src/openrct2/ride/water/SplashBoats.cpp b/src/openrct2/ride/water/SplashBoats.cpp index 26726d5e19..acbd28cc1b 100644 --- a/src/openrct2/ride/water/SplashBoats.cpp +++ b/src/openrct2/ride/water/SplashBoats.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "../../config/Config.h" #include "../../entity/EntityRegistry.h" #include "../../interface/Viewport.h" #include "../../paint/Paint.h" diff --git a/src/openrct2/ui/DummyUiContext.cpp b/src/openrct2/ui/DummyUiContext.cpp index 9104dcecd2..72ef0af253 100644 --- a/src/openrct2/ui/DummyUiContext.cpp +++ b/src/openrct2/ui/DummyUiContext.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "../config/Config.h" #include "../drawing/X8DrawingEngine.h" #include "UiContext.h" #include "WindowManager.h" diff --git a/src/openrct2/ui/UiContext.h b/src/openrct2/ui/UiContext.h index d561ec2d30..7f86450917 100644 --- a/src/openrct2/ui/UiContext.h +++ b/src/openrct2/ui/UiContext.h @@ -11,7 +11,7 @@ #include "../Context.h" #include "../common.h" -#include "../config/Config.h" +#include "../config/ConfigTypes.h" #include "../interface/Cursors.h" #include diff --git a/src/openrct2/world/Map.cpp b/src/openrct2/world/Map.cpp index bca8e1bf62..13894856db 100644 --- a/src/openrct2/world/Map.cpp +++ b/src/openrct2/world/Map.cpp @@ -20,7 +20,6 @@ #include "../actions/ParkEntranceRemoveAction.h" #include "../actions/WallRemoveAction.h" #include "../audio/audio.h" -#include "../config/Config.h" #include "../core/Guard.hpp" #include "../interface/Cursors.h" #include "../interface/Viewport.h" diff --git a/src/openrct2/world/Park.cpp b/src/openrct2/world/Park.cpp index 98a3f5e07b..f6b002264f 100644 --- a/src/openrct2/world/Park.cpp +++ b/src/openrct2/world/Park.cpp @@ -16,7 +16,6 @@ #include "../GameState.h" #include "../OpenRCT2.h" #include "../actions/ParkSetParameterAction.h" -#include "../config/Config.h" #include "../core/Memory.hpp" #include "../core/String.hpp" #include "../entity/Litter.h" diff --git a/test/tests/S6ImportExportTests.cpp b/test/tests/S6ImportExportTests.cpp index 4e132acc4a..0c82eaf354 100644 --- a/test/tests/S6ImportExportTests.cpp +++ b/test/tests/S6ImportExportTests.cpp @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include