From fb2c835d527838c5e04a477af8542d411312e3ef Mon Sep 17 00:00:00 2001 From: Ted John Date: Sat, 18 Feb 2017 15:45:10 +0000 Subject: [PATCH] Include new config header --- src/openrct2/OpenRCT2.cpp | 2 +- src/openrct2/audio/AudioMixer.cpp | 2 +- src/openrct2/audio/audio.cpp | 2 +- src/openrct2/cheats.c | 2 +- src/openrct2/cmdline/RootCommands.cpp | 2 +- src/openrct2/config/Config.cpp | 9 +++++ src/openrct2/config/Config.h | 20 ++++++----- src/openrct2/config/KeyboardShortcuts.cpp | 2 +- src/openrct2/drawing/IDrawingEngine.h | 10 ++++-- src/openrct2/drawing/NewDrawing.cpp | 2 +- src/openrct2/drawing/Rain.cpp | 2 +- .../drawing/engines/SoftwareDrawingEngine.cpp | 2 +- .../engines/opengl/OpenGLDrawingEngine.cpp | 4 +-- src/openrct2/drawing/scrolling_text.c | 2 +- src/openrct2/drawing/sprite.cpp | 2 +- src/openrct2/drawing/string.c | 1 + src/openrct2/game.c | 2 +- src/openrct2/input.c | 2 +- src/openrct2/interface/Fonts.cpp | 2 +- src/openrct2/interface/Theme.cpp | 3 +- src/openrct2/interface/console.c | 2 +- src/openrct2/interface/keyboard_shortcut.c | 2 +- src/openrct2/interface/keyboard_shortcut.h | 4 +-- src/openrct2/interface/screenshot.c | 2 +- src/openrct2/interface/viewport.c | 2 +- src/openrct2/interface/window.c | 2 +- src/openrct2/localisation/currency.c | 2 +- src/openrct2/localisation/localisation.c | 2 +- src/openrct2/management/award.c | 2 +- src/openrct2/management/marketing.c | 2 +- src/openrct2/management/research.c | 2 +- .../network/NetworkServerAdvertiser.cpp | 2 +- src/openrct2/network/network.cpp | 2 +- src/openrct2/network/twitch.cpp | 2 +- src/openrct2/object/ObjectRepository.cpp | 2 +- src/openrct2/object/RideObject.cpp | 2 +- src/openrct2/paint/map_element/banner.c | 2 +- src/openrct2/paint/map_element/entrance.c | 2 +- src/openrct2/paint/map_element/fence.c | 2 +- src/openrct2/paint/map_element/map_element.c | 2 +- src/openrct2/paint/map_element/path.c | 2 +- src/openrct2/paint/map_element/scenery.c | 2 +- .../paint/map_element/scenery_multiple.c | 2 +- src/openrct2/paint/map_element/surface.c | 2 +- src/openrct2/paint/paint.c | 2 +- src/openrct2/paint/sprite/peep.c | 2 +- src/openrct2/peep/peep.c | 2 +- src/openrct2/peep/staff.c | 2 +- src/openrct2/platform/linux.c | 2 +- src/openrct2/platform/posix.c | 2 +- src/openrct2/platform/shared.c | 3 +- src/openrct2/platform/windows.c | 2 +- src/openrct2/rct1.c | 2 +- src/openrct2/rct2.c | 3 +- src/openrct2/rct2/S6Exporter.cpp | 2 +- src/openrct2/rct2/S6Importer.cpp | 2 +- src/openrct2/ride/gentle/mini_golf.c | 2 +- src/openrct2/ride/ride.c | 2 +- src/openrct2/ride/thrill/launched_freefall.c | 2 +- src/openrct2/ride/track.c | 2 +- src/openrct2/ride/track_design_save.c | 2 +- src/openrct2/ride/track_paint.c | 2 +- src/openrct2/ride/vehicle.c | 2 +- src/openrct2/ride/water/river_rapids.c | 2 +- src/openrct2/ride/water/splash_boats.c | 2 +- src/openrct2/scenario/ScenarioRepository.cpp | 3 +- src/openrct2/scenario/scenario.c | 2 +- src/openrct2/scenario/scenario.h | 3 +- src/openrct2/title/TitleScreen.cpp | 2 +- src/openrct2/windows/banner.c | 2 +- src/openrct2/windows/cheats.c | 2 +- src/openrct2/windows/custom_currency.c | 2 +- src/openrct2/windows/editor_bottom_toolbar.c | 2 +- .../windows/editor_object_selection.c | 2 +- src/openrct2/windows/error.c | 3 +- src/openrct2/windows/finances.c | 2 +- src/openrct2/windows/game_bottom_toolbar.c | 2 +- src/openrct2/windows/guest.c | 2 +- src/openrct2/windows/guest_list.c | 2 +- src/openrct2/windows/install_track.c | 3 +- src/openrct2/windows/loadsave.c | 2 +- src/openrct2/windows/map_tooltip.c | 3 +- src/openrct2/windows/multiplayer.c | 2 +- src/openrct2/windows/new_campaign.c | 2 +- src/openrct2/windows/new_ride.c | 2 +- src/openrct2/windows/news_options.c | 36 +++++++++---------- src/openrct2/windows/options.c | 3 +- src/openrct2/windows/park.c | 2 +- src/openrct2/windows/player.c | 2 +- src/openrct2/windows/ride.c | 2 +- src/openrct2/windows/ride_construction.c | 2 +- src/openrct2/windows/ride_list.c | 2 +- src/openrct2/windows/save_prompt.c | 2 +- src/openrct2/windows/server_list.c | 2 +- src/openrct2/windows/server_start.c | 2 +- src/openrct2/windows/shortcut_key_change.c | 2 +- src/openrct2/windows/shortcut_keys.c | 2 +- src/openrct2/windows/sign.c | 2 +- src/openrct2/windows/staff.c | 2 +- src/openrct2/windows/staff_list.c | 2 +- src/openrct2/windows/text_input.c | 2 +- src/openrct2/windows/themes.c | 2 +- src/openrct2/windows/title_editor.c | 2 +- src/openrct2/windows/title_exit.c | 2 +- src/openrct2/windows/title_menu.c | 2 +- src/openrct2/windows/title_options.c | 2 +- src/openrct2/windows/title_scenarioselect.c | 2 +- src/openrct2/windows/top_toolbar.c | 2 +- src/openrct2/windows/track_list.c | 3 +- src/openrct2/windows/view_clipping.c | 2 +- src/openrct2/world/climate.c | 2 +- src/openrct2/world/map.c | 2 +- src/openrct2/world/park.c | 2 +- 113 files changed, 166 insertions(+), 140 deletions(-) diff --git a/src/openrct2/OpenRCT2.cpp b/src/openrct2/OpenRCT2.cpp index 72fbb8d749..9de2e9cf6f 100644 --- a/src/openrct2/OpenRCT2.cpp +++ b/src/openrct2/OpenRCT2.cpp @@ -35,7 +35,7 @@ extern "C" { #include "audio/audio.h" - #include "config.h" + #include "config/Config.h" #include "editor.h" #include "game.h" #include "interface/chat.h" diff --git a/src/openrct2/audio/AudioMixer.cpp b/src/openrct2/audio/AudioMixer.cpp index 981d45c0ed..af0a2e6370 100644 --- a/src/openrct2/audio/AudioMixer.cpp +++ b/src/openrct2/audio/AudioMixer.cpp @@ -25,7 +25,7 @@ extern "C" { - #include "../config.h" + #include "../config/Config.h" #include "../localisation/localisation.h" #include "../OpenRCT2.h" #include "../platform/platform.h" diff --git a/src/openrct2/audio/audio.cpp b/src/openrct2/audio/audio.cpp index b4d83e54f7..d5efc2cabd 100644 --- a/src/openrct2/audio/audio.cpp +++ b/src/openrct2/audio/audio.cpp @@ -24,7 +24,7 @@ extern "C" { - #include "../config.h" + #include "../config/Config.h" #include "../interface/viewport.h" #include "../intro.h" #include "../localisation/language.h" diff --git a/src/openrct2/cheats.c b/src/openrct2/cheats.c index 48ec7a62f9..bdf2bf7b5a 100644 --- a/src/openrct2/cheats.c +++ b/src/openrct2/cheats.c @@ -15,7 +15,7 @@ #pragma endregion #include "cheats.h" -#include "config.h" +#include "config/Config.h" #include "game.h" #include "interface/window.h" #include "localisation/date.h" diff --git a/src/openrct2/cmdline/RootCommands.cpp b/src/openrct2/cmdline/RootCommands.cpp index 62fb60ffb3..b68ca8e7f1 100644 --- a/src/openrct2/cmdline/RootCommands.cpp +++ b/src/openrct2/cmdline/RootCommands.cpp @@ -20,7 +20,7 @@ extern "C" { - #include "../config.h" + #include "../config/Config.h" #include "../platform/crash.h" } diff --git a/src/openrct2/config/Config.cpp b/src/openrct2/config/Config.cpp index 0ba2d67294..50d1e4917e 100644 --- a/src/openrct2/config/Config.cpp +++ b/src/openrct2/config/Config.cpp @@ -33,6 +33,7 @@ extern "C" #include "../localisation/currency.h" #include "../localisation/date.h" #include "../localisation/language.h" + #include "../platform/platform.h" #include "../scenario/scenario.h" } @@ -587,6 +588,14 @@ namespace Config extern "C" { + GeneralConfiguration gConfigGeneral; + InterfaceConfiguration gConfigInterface; + SoundConfiguration gConfigSound; + TwitchConfiguration gConfigTwitch; + NetworkConfiguration gConfigNetwork; + NotificationConfiguration gConfigNotifications; + FontConfiguration gConfigFonts; + void config_set_defaults() { Config::SetDefaults(); diff --git a/src/openrct2/config/Config.h b/src/openrct2/config/Config.h index 040042e599..d8f812666a 100644 --- a/src/openrct2/config/Config.h +++ b/src/openrct2/config/Config.h @@ -187,14 +187,6 @@ typedef struct FontConfiguration sint32 height_big; } FontConfiguration; -extern GeneralConfiguration gConfigGeneral; -extern InterfaceConfiguration gConfigInterface; -extern SoundConfiguration gConfigSound; -extern TwitchConfiguration gConfigTwitch; -extern NetworkConfiguration gConfigNetwork; -extern NotificationConfiguration gConfigNotifications; -extern FontConfiguration gConfigFonts; - enum SORT { SORT_NAME_ASCENDING, @@ -216,8 +208,18 @@ enum MEASUREMENT_FORMAT MEASUREMENT_FORMAT_SI }; +#ifdef __cplusplus extern "C" { +#endif + extern GeneralConfiguration gConfigGeneral; + extern InterfaceConfiguration gConfigInterface; + extern SoundConfiguration gConfigSound; + extern TwitchConfiguration gConfigTwitch; + extern NetworkConfiguration gConfigNetwork; + extern NotificationConfiguration gConfigNotifications; + extern FontConfiguration gConfigFonts; + bool config_open(const utf8 * path); bool config_save(const utf8 * path); void config_get_default_path(utf8 *outPath, size_t size); @@ -226,4 +228,6 @@ extern "C" bool config_open_default(); bool config_save_default(); bool config_find_or_browse_install_directory(); +#ifdef __cplusplus } +#endif diff --git a/src/openrct2/config/KeyboardShortcuts.cpp b/src/openrct2/config/KeyboardShortcuts.cpp index 95e0cdbd4e..e2b9272188 100644 --- a/src/openrct2/config/KeyboardShortcuts.cpp +++ b/src/openrct2/config/KeyboardShortcuts.cpp @@ -20,10 +20,10 @@ #include "../core/Memory.hpp" #include "../core/Path.hpp" #include "../core/String.hpp" -#include "../interface/keyboard_shortcut.h" extern "C" { + #include "../interface/keyboard_shortcut.h" #include "../platform/platform.h" } diff --git a/src/openrct2/drawing/IDrawingEngine.h b/src/openrct2/drawing/IDrawingEngine.h index 96cb70b387..a9e7287201 100644 --- a/src/openrct2/drawing/IDrawingEngine.h +++ b/src/openrct2/drawing/IDrawingEngine.h @@ -20,9 +20,6 @@ #include -struct rct_drawpixelinfo; -interface IDrawingContext; - enum DRAWING_ENGINE { DRAWING_ENGINE_NONE = -1, @@ -41,6 +38,11 @@ enum DRAWING_ENGINE_FLAGS DEF_DIRTY_OPTIMISATIONS = 1 << 0, }; +#ifdef __cplusplus + +struct rct_drawpixelinfo; +interface IDrawingContext; + interface IDrawingEngine { virtual ~IDrawingEngine() { } @@ -81,3 +83,5 @@ interface IRainDrawer sint32 xStart, sint32 yStart) abstract; }; + +#endif diff --git a/src/openrct2/drawing/NewDrawing.cpp b/src/openrct2/drawing/NewDrawing.cpp index 1b91c5dcca..5e2b479ad8 100644 --- a/src/openrct2/drawing/NewDrawing.cpp +++ b/src/openrct2/drawing/NewDrawing.cpp @@ -21,7 +21,7 @@ extern "C" { - #include "../config.h" + #include "../config/Config.h" #include "../drawing/drawing.h" #include "../interface/screenshot.h" #include "../localisation/string_ids.h" diff --git a/src/openrct2/drawing/Rain.cpp b/src/openrct2/drawing/Rain.cpp index b73e64ed43..5cf27f7ef7 100644 --- a/src/openrct2/drawing/Rain.cpp +++ b/src/openrct2/drawing/Rain.cpp @@ -19,7 +19,7 @@ extern "C" #include "../interface/window.h" #include "../world/climate.h" #include "drawing.h" - #include "../config.h" + #include "../config/Config.h" } #include "IDrawingEngine.h" diff --git a/src/openrct2/drawing/engines/SoftwareDrawingEngine.cpp b/src/openrct2/drawing/engines/SoftwareDrawingEngine.cpp index a1a6a14f8e..87ab3a7459 100644 --- a/src/openrct2/drawing/engines/SoftwareDrawingEngine.cpp +++ b/src/openrct2/drawing/engines/SoftwareDrawingEngine.cpp @@ -23,7 +23,7 @@ extern "C" { - #include "../../config.h" + #include "../../config/Config.h" #include "../../game.h" #include "../../interface/screenshot.h" #include "../../interface/viewport.h" diff --git a/src/openrct2/drawing/engines/opengl/OpenGLDrawingEngine.cpp b/src/openrct2/drawing/engines/opengl/OpenGLDrawingEngine.cpp index 725f484428..e870cf540b 100644 --- a/src/openrct2/drawing/engines/opengl/OpenGLDrawingEngine.cpp +++ b/src/openrct2/drawing/engines/opengl/OpenGLDrawingEngine.cpp @@ -47,11 +47,11 @@ IDrawingEngine * DrawingEngineFactory::CreateOpenGL() #include "../../IDrawingContext.h" #include "../../IDrawingEngine.h" #include "../../Rain.h" -#include "../../../config.h" +#include "../../../config/Config.h" extern "C" { - #include "../../../config.h" + #include "../../../config/Config.h" #include "../../../interface/screenshot.h" #include "../../../interface/window.h" #include "../../../intro.h" diff --git a/src/openrct2/drawing/scrolling_text.c b/src/openrct2/drawing/scrolling_text.c index 3334f6f2cb..746b8fd6ad 100644 --- a/src/openrct2/drawing/scrolling_text.c +++ b/src/openrct2/drawing/scrolling_text.c @@ -15,7 +15,7 @@ #pragma endregion #include "../rct2/addresses.h" -#include "../config.h" +#include "../config/Config.h" #include "../interface/colour.h" #include "../localisation/localisation.h" #include "../sprites.h" diff --git a/src/openrct2/drawing/sprite.cpp b/src/openrct2/drawing/sprite.cpp index 1a27f690dc..f58c1752ad 100644 --- a/src/openrct2/drawing/sprite.cpp +++ b/src/openrct2/drawing/sprite.cpp @@ -24,7 +24,7 @@ extern "C" { - #include "../config.h" + #include "../config/Config.h" #include "../rct2/addresses.h" #include "../util/util.h" #include "drawing.h" diff --git a/src/openrct2/drawing/string.c b/src/openrct2/drawing/string.c index 7733a39ca6..621897b7f3 100644 --- a/src/openrct2/drawing/string.c +++ b/src/openrct2/drawing/string.c @@ -17,6 +17,7 @@ #include "../interface/colour.h" #include "../interface/viewport.h" #include "../localisation/localisation.h" +#include "../platform/platform.h" #include "../sprites.h" #include "../util/util.h" diff --git a/src/openrct2/game.c b/src/openrct2/game.c index 43fa7e97a1..f42a5771b9 100644 --- a/src/openrct2/game.c +++ b/src/openrct2/game.c @@ -16,7 +16,7 @@ #include "audio/audio.h" #include "cheats.h" -#include "config.h" +#include "config/Config.h" #include "editor.h" #include "game.h" #include "input.h" diff --git a/src/openrct2/input.c b/src/openrct2/input.c index 39284a33b7..7c693b92d5 100644 --- a/src/openrct2/input.c +++ b/src/openrct2/input.c @@ -16,7 +16,7 @@ #include #include "audio/audio.h" -#include "config.h" +#include "config/Config.h" #include "game.h" #include "input.h" #include "interface/chat.h" diff --git a/src/openrct2/interface/Fonts.cpp b/src/openrct2/interface/Fonts.cpp index 66fad11583..ca6d759703 100644 --- a/src/openrct2/interface/Fonts.cpp +++ b/src/openrct2/interface/Fonts.cpp @@ -21,7 +21,7 @@ #include "Fonts.h" extern "C" { -#include "../config.h" +#include "../config/Config.h" #include "../drawing/drawing.h" #include "../localisation/language.h" } diff --git a/src/openrct2/interface/Theme.cpp b/src/openrct2/interface/Theme.cpp index 4c419ce5f8..ff0cb0fc86 100644 --- a/src/openrct2/interface/Theme.cpp +++ b/src/openrct2/interface/Theme.cpp @@ -22,7 +22,8 @@ extern "C" { #include "../common.h" - #include "../config.h" + #include "../config/Config.h" + #include "../platform/platform.h" #include "themes.h" #include "window.h" } diff --git a/src/openrct2/interface/console.c b/src/openrct2/interface/console.c index bd3aeedec7..488cdd0228 100644 --- a/src/openrct2/interface/console.c +++ b/src/openrct2/interface/console.c @@ -17,7 +17,7 @@ #include #include -#include "../config.h" +#include "../config/Config.h" #include "../drawing/drawing.h" #include "../game.h" #include "../input.h" diff --git a/src/openrct2/interface/keyboard_shortcut.c b/src/openrct2/interface/keyboard_shortcut.c index 23d21021b1..ff561361bb 100644 --- a/src/openrct2/interface/keyboard_shortcut.c +++ b/src/openrct2/interface/keyboard_shortcut.c @@ -15,7 +15,7 @@ #pragma endregion #include "../audio/audio.h" -#include "../config.h" +#include "../config/Config.h" #include "../editor.h" #include "../game.h" #include "../input.h" diff --git a/src/openrct2/interface/keyboard_shortcut.h b/src/openrct2/interface/keyboard_shortcut.h index 4d4efd24dc..29bf930c8f 100644 --- a/src/openrct2/interface/keyboard_shortcut.h +++ b/src/openrct2/interface/keyboard_shortcut.h @@ -38,8 +38,6 @@ typedef struct shortcut_entry { uint8 modifier; } shortcut_entry; -extern uint16 gShortcutKeys[SHORTCUT_COUNT]; - enum { SHORTCUT_CLOSE_TOP_MOST_WINDOW, SHORTCUT_CLOSE_ALL_FLOATING_WINDOWS, @@ -97,4 +95,6 @@ enum { SHORTCUT_COUNT }; +extern uint16 gShortcutKeys[SHORTCUT_COUNT]; + #endif diff --git a/src/openrct2/interface/screenshot.c b/src/openrct2/interface/screenshot.c index 86a3f6af82..af45a9c394 100644 --- a/src/openrct2/interface/screenshot.c +++ b/src/openrct2/interface/screenshot.c @@ -15,7 +15,7 @@ #pragma endregion #include "../audio/audio.h" -#include "../config.h" +#include "../config/Config.h" #include "../drawing/drawing.h" #include "../game.h" #include "../Imaging.h" diff --git a/src/openrct2/interface/viewport.c b/src/openrct2/interface/viewport.c index c48b043186..5dbe953783 100644 --- a/src/openrct2/interface/viewport.c +++ b/src/openrct2/interface/viewport.c @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../config.h" +#include "../config/Config.h" #include "../drawing/drawing.h" #include "../game.h" #include "../input.h" diff --git a/src/openrct2/interface/window.c b/src/openrct2/interface/window.c index 39eec54670..6bcf417546 100644 --- a/src/openrct2/interface/window.c +++ b/src/openrct2/interface/window.c @@ -29,7 +29,7 @@ #include "viewport.h" #include "widget.h" #include "window.h" -#include "../config.h" +#include "../config/Config.h" #define RCT2_FIRST_WINDOW (g_window_list) #define RCT2_LAST_WINDOW (gWindowNextSlot - 1) diff --git a/src/openrct2/localisation/currency.c b/src/openrct2/localisation/currency.c index aa570ebc23..2081cb2085 100644 --- a/src/openrct2/localisation/currency.c +++ b/src/openrct2/localisation/currency.c @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../config.h" +#include "../config/Config.h" #include "../util/util.h" #include "currency.h" #include "string_ids.h" diff --git a/src/openrct2/localisation/localisation.c b/src/openrct2/localisation/localisation.c index 6abd04d044..3bfb088cbb 100644 --- a/src/openrct2/localisation/localisation.c +++ b/src/openrct2/localisation/localisation.c @@ -23,7 +23,7 @@ #include #endif // __WINDOWS__ -#include "../config.h" +#include "../config/Config.h" #include "../game.h" #include "../util/util.h" #include "date.h" diff --git a/src/openrct2/management/award.c b/src/openrct2/management/award.c index df0b6982ed..f434d6e6d7 100644 --- a/src/openrct2/management/award.c +++ b/src/openrct2/management/award.c @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../config.h" +#include "../config/Config.h" #include "../interface/window.h" #include "../localisation/localisation.h" #include "../peep/peep.h" diff --git a/src/openrct2/management/marketing.c b/src/openrct2/management/marketing.c index 3c0de6ff2d..0bcad0cb14 100644 --- a/src/openrct2/management/marketing.c +++ b/src/openrct2/management/marketing.c @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../config.h" +#include "../config/Config.h" #include "../game.h" #include "../interface/window.h" #include "../localisation/localisation.h" diff --git a/src/openrct2/management/research.c b/src/openrct2/management/research.c index e27835eb8e..8adf4d9d56 100644 --- a/src/openrct2/management/research.c +++ b/src/openrct2/management/research.c @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../config.h" +#include "../config/Config.h" #include "../game.h" #include "../interface/window.h" #include "../localisation/date.h" diff --git a/src/openrct2/network/NetworkServerAdvertiser.cpp b/src/openrct2/network/NetworkServerAdvertiser.cpp index 194c108019..13b02df084 100644 --- a/src/openrct2/network/NetworkServerAdvertiser.cpp +++ b/src/openrct2/network/NetworkServerAdvertiser.cpp @@ -25,7 +25,7 @@ extern "C" { - #include "../config.h" + #include "../config/Config.h" #include "../localisation/date.h" #include "../management/finance.h" #include "../peep/peep.h" diff --git a/src/openrct2/network/network.cpp b/src/openrct2/network/network.cpp index 5126514345..ce8ef1a5a9 100644 --- a/src/openrct2/network/network.cpp +++ b/src/openrct2/network/network.cpp @@ -51,7 +51,7 @@ sint32 _pickup_peep_old_x = SPRITE_LOCATION_NULL; #include "../rct2/S6Exporter.h" extern "C" { -#include "../config.h" +#include "../config/Config.h" #include "../game.h" #include "../interface/chat.h" #include "../interface/window.h" diff --git a/src/openrct2/network/twitch.cpp b/src/openrct2/network/twitch.cpp index 3ddf3e5a4a..7290a1640a 100644 --- a/src/openrct2/network/twitch.cpp +++ b/src/openrct2/network/twitch.cpp @@ -35,7 +35,7 @@ extern "C" { - #include "../config.h" + #include "../config/Config.h" #include "../drawing/drawing.h" #include "../game.h" #include "../interface/console.h" diff --git a/src/openrct2/object/ObjectRepository.cpp b/src/openrct2/object/ObjectRepository.cpp index a089805fce..9ffe6f038b 100644 --- a/src/openrct2/object/ObjectRepository.cpp +++ b/src/openrct2/object/ObjectRepository.cpp @@ -43,7 +43,7 @@ extern "C" { - #include "../config.h" + #include "../config/Config.h" #include "../localisation/localisation.h" #include "../object.h" #include "../object_list.h" diff --git a/src/openrct2/object/RideObject.cpp b/src/openrct2/object/RideObject.cpp index b1034c008c..476e452b76 100644 --- a/src/openrct2/object/RideObject.cpp +++ b/src/openrct2/object/RideObject.cpp @@ -23,7 +23,7 @@ extern "C" { - #include "../config.h" + #include "../config/Config.h" #include "../drawing/drawing.h" #include "../localisation/localisation.h" #include "../rct1.h" diff --git a/src/openrct2/paint/map_element/banner.c b/src/openrct2/paint/map_element/banner.c index 73dcc271aa..ccfcd33af9 100644 --- a/src/openrct2/paint/map_element/banner.c +++ b/src/openrct2/paint/map_element/banner.c @@ -15,7 +15,7 @@ #pragma endregion #include "../paint.h" -#include "../../config.h" +#include "../../config/Config.h" #include "../../game.h" #include "../../interface/viewport.h" #include "../../localisation/localisation.h" diff --git a/src/openrct2/paint/map_element/entrance.c b/src/openrct2/paint/map_element/entrance.c index 19d7156275..9f24b28ff2 100644 --- a/src/openrct2/paint/map_element/entrance.c +++ b/src/openrct2/paint/map_element/entrance.c @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../config.h" +#include "../../config/Config.h" #include "../../game.h" #include "../../interface/viewport.h" #include "../../localisation/localisation.h" diff --git a/src/openrct2/paint/map_element/fence.c b/src/openrct2/paint/map_element/fence.c index e7f8a1dc1d..362b97c96e 100644 --- a/src/openrct2/paint/map_element/fence.c +++ b/src/openrct2/paint/map_element/fence.c @@ -20,7 +20,7 @@ #include "../../world/scenery.h" #include "../../game.h" #include "../../ride/track.h" -#include "../../config.h" +#include "../../config/Config.h" #include "../../localisation/localisation.h" #include "../../interface/colour.h" #include "../../interface/viewport.h" diff --git a/src/openrct2/paint/map_element/map_element.c b/src/openrct2/paint/map_element/map_element.c index 1b0e748d1e..652e2acbab 100644 --- a/src/openrct2/paint/map_element/map_element.c +++ b/src/openrct2/paint/map_element/map_element.c @@ -21,7 +21,7 @@ #include "../../ride/ride_data.h" #include "../../ride/track_data.h" #include "../../ride/track_paint.h" -#include "../../config.h" +#include "../../config/Config.h" #include "../../world/sprite.h" #include "../../world/banner.h" #include "../../world/entrance.h" diff --git a/src/openrct2/paint/map_element/path.c b/src/openrct2/paint/map_element/path.c index 89e8c5038c..c2aeab96ed 100644 --- a/src/openrct2/paint/map_element/path.c +++ b/src/openrct2/paint/map_element/path.c @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../config.h" +#include "../../config/Config.h" #include "../../game.h" #include "../../interface/viewport.h" #include "../../localisation/localisation.h" diff --git a/src/openrct2/paint/map_element/scenery.c b/src/openrct2/paint/map_element/scenery.c index a6ba6c7304..165821a3ee 100644 --- a/src/openrct2/paint/map_element/scenery.c +++ b/src/openrct2/paint/map_element/scenery.c @@ -15,7 +15,7 @@ #pragma endregion #include "map_element.h" -#include "../../config.h" +#include "../../config/Config.h" #include "../../game.h" #include "../../interface/viewport.h" #include "../../localisation/date.h" diff --git a/src/openrct2/paint/map_element/scenery_multiple.c b/src/openrct2/paint/map_element/scenery_multiple.c index c0e9b64ec3..2f83176796 100644 --- a/src/openrct2/paint/map_element/scenery_multiple.c +++ b/src/openrct2/paint/map_element/scenery_multiple.c @@ -17,7 +17,7 @@ #include "map_element.h" #include "../paint.h" #include "../supports.h" -#include "../../config.h" +#include "../../config/Config.h" #include "../../game.h" #include "../../interface/viewport.h" #include "../../localisation/localisation.h" diff --git a/src/openrct2/paint/map_element/surface.c b/src/openrct2/paint/map_element/surface.c index 1b430f5807..5e422fdc12 100644 --- a/src/openrct2/paint/map_element/surface.c +++ b/src/openrct2/paint/map_element/surface.c @@ -15,7 +15,7 @@ #pragma endregion #include "../../cheats.h" -#include "../../config.h" +#include "../../config/Config.h" #include "../../interface/viewport.h" #include "../../peep/staff.h" #include "../../rct2.h" diff --git a/src/openrct2/paint/paint.c b/src/openrct2/paint/paint.c index 95121d63ca..c426510142 100644 --- a/src/openrct2/paint/paint.c +++ b/src/openrct2/paint/paint.c @@ -17,7 +17,7 @@ #include "paint.h" #include "../drawing/drawing.h" #include "../localisation/localisation.h" -#include "../config.h" +#include "../config/Config.h" #include "../interface/viewport.h" #include "map_element/map_element.h" #include "sprite/sprite.h" diff --git a/src/openrct2/paint/sprite/peep.c b/src/openrct2/paint/sprite/peep.c index 2baec97009..78629cb7b7 100644 --- a/src/openrct2/paint/sprite/peep.c +++ b/src/openrct2/paint/sprite/peep.c @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../config.h" +#include "../../config/Config.h" #include "../../drawing/lightfx.h" #include "../../interface/viewport.h" #include "../../paint/sprite/sprite.h" diff --git a/src/openrct2/peep/peep.c b/src/openrct2/peep/peep.c index aeef199b52..015e93bd90 100644 --- a/src/openrct2/peep/peep.c +++ b/src/openrct2/peep/peep.c @@ -17,7 +17,7 @@ #include "../audio/audio.h" #include "../audio/AudioMixer.h" #include "../cheats.h" -#include "../config.h" +#include "../config/Config.h" #include "../game.h" #include "../input.h" #include "../interface/window.h" diff --git a/src/openrct2/peep/staff.c b/src/openrct2/peep/staff.c index d197541e21..fffb4c932e 100644 --- a/src/openrct2/peep/staff.c +++ b/src/openrct2/peep/staff.c @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../config.h" +#include "../config/Config.h" #include "../game.h" #include "../interface/viewport.h" #include "../localisation/date.h" diff --git a/src/openrct2/platform/linux.c b/src/openrct2/platform/linux.c index 4805814fc3..252232f9a2 100644 --- a/src/openrct2/platform/linux.c +++ b/src/openrct2/platform/linux.c @@ -33,7 +33,7 @@ #include #include -#include "../config.h" +#include "../config/Config.h" #include "../localisation/language.h" #include "../localisation/string_ids.h" #include "../util/util.h" diff --git a/src/openrct2/platform/posix.c b/src/openrct2/platform/posix.c index e3c1a14a0c..10edddbf22 100644 --- a/src/openrct2/platform/posix.c +++ b/src/openrct2/platform/posix.c @@ -26,7 +26,7 @@ #include #include #include -#include "../config.h" +#include "../config/Config.h" #include "../localisation/language.h" #include "../OpenRCT2.h" #include "../util/util.h" diff --git a/src/openrct2/platform/shared.c b/src/openrct2/platform/shared.c index 69167de298..85904494fe 100644 --- a/src/openrct2/platform/shared.c +++ b/src/openrct2/platform/shared.c @@ -16,8 +16,9 @@ #include "../audio/audio.h" #include "../audio/AudioMixer.h" -#include "../config.h" +#include "../config/Config.h" #include "../drawing/drawing.h" +#include "../drawing/IDrawingEngine.h" #include "../drawing/lightfx.h" #include "../editor.h" #include "../game.h" diff --git a/src/openrct2/platform/windows.c b/src/openrct2/platform/windows.c index d7b4f944fe..6af069d80f 100644 --- a/src/openrct2/platform/windows.c +++ b/src/openrct2/platform/windows.c @@ -31,7 +31,7 @@ #include #include -#include "../config.h" +#include "../config/Config.h" #include "../localisation/language.h" #include "../OpenRCT2.h" #include "../util/util.h" diff --git a/src/openrct2/rct1.c b/src/openrct2/rct1.c index 087dbfc049..8fc3ec223f 100644 --- a/src/openrct2/rct1.c +++ b/src/openrct2/rct1.c @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "config.h" +#include "config/Config.h" #include "game.h" #include "localisation/string_ids.h" #include "rct1.h" diff --git a/src/openrct2/rct2.c b/src/openrct2/rct2.c index 0d060e2f1f..193b190f7f 100644 --- a/src/openrct2/rct2.c +++ b/src/openrct2/rct2.c @@ -19,7 +19,7 @@ #include #include "audio/audio.h" #include "audio/AudioMixer.h" -#include "config.h" +#include "config/Config.h" #include "drawing/drawing.h" #include "drawing/lightfx.h" #include "editor.h" @@ -27,6 +27,7 @@ #include "input.h" #include "interface/chat.h" #include "interface/console.h" +#include "interface/keyboard_shortcut.h" #include "interface/viewport.h" #include "intro.h" #include "localisation/date.h" diff --git a/src/openrct2/rct2/S6Exporter.cpp b/src/openrct2/rct2/S6Exporter.cpp index 4b021e594c..3a9e2c5d6a 100644 --- a/src/openrct2/rct2/S6Exporter.cpp +++ b/src/openrct2/rct2/S6Exporter.cpp @@ -27,7 +27,7 @@ extern "C" { - #include "../config.h" + #include "../config/Config.h" #include "../game.h" #include "../interface/viewport.h" #include "../interface/window.h" diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index f235c4bb1e..63ab974b46 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -29,7 +29,7 @@ extern "C" { - #include "../config.h" + #include "../config/Config.h" #include "../game.h" #include "../interface/viewport.h" #include "../localisation/date.h" diff --git a/src/openrct2/ride/gentle/mini_golf.c b/src/openrct2/ride/gentle/mini_golf.c index 85d097e713..fe4f327247 100644 --- a/src/openrct2/ride/gentle/mini_golf.c +++ b/src/openrct2/ride/gentle/mini_golf.c @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../config.h" +#include "../../config/Config.h" #include "../../interface/viewport.h" #include "../../paint/paint.h" #include "../../paint/supports.h" diff --git a/src/openrct2/ride/ride.c b/src/openrct2/ride/ride.c index 4bf2218982..db6155797a 100644 --- a/src/openrct2/ride/ride.c +++ b/src/openrct2/ride/ride.c @@ -18,7 +18,7 @@ #include "../audio/AudioMixer.h" #include "../cheats.h" #include "../common.h" -#include "../config.h" +#include "../config/Config.h" #include "../editor.h" #include "../game.h" #include "../input.h" diff --git a/src/openrct2/ride/thrill/launched_freefall.c b/src/openrct2/ride/thrill/launched_freefall.c index 9d05dc9e5f..0afca53064 100644 --- a/src/openrct2/ride/thrill/launched_freefall.c +++ b/src/openrct2/ride/thrill/launched_freefall.c @@ -15,7 +15,7 @@ #pragma endregion #include "../../common.h" -#include "../../config.h" +#include "../../config/Config.h" #include "../../interface/viewport.h" #include "../../world/sprite.h" #include "../../paint/paint.h" diff --git a/src/openrct2/ride/track.c b/src/openrct2/ride/track.c index 855a2a4bff..cfb7df9cfb 100644 --- a/src/openrct2/ride/track.c +++ b/src/openrct2/ride/track.c @@ -16,7 +16,7 @@ #include "../audio/audio.h" #include "../cheats.h" -#include "../config.h" +#include "../config/Config.h" #include "../game.h" #include "../interface/viewport.h" #include "../localisation/localisation.h" diff --git a/src/openrct2/ride/track_design_save.c b/src/openrct2/ride/track_design_save.c index 0066e2b4a0..504c801b21 100644 --- a/src/openrct2/ride/track_design_save.c +++ b/src/openrct2/ride/track_design_save.c @@ -15,7 +15,7 @@ #pragma endregion #include "../audio/audio.h" -#include "../config.h" +#include "../config/Config.h" #include "../game.h" #include "../localisation/localisation.h" #include "../localisation/string_ids.h" diff --git a/src/openrct2/ride/track_paint.c b/src/openrct2/ride/track_paint.c index d157556aad..be45d6b807 100644 --- a/src/openrct2/ride/track_paint.c +++ b/src/openrct2/ride/track_paint.c @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../config.h" +#include "../config/Config.h" #include "../drawing/drawing.h" #include "../paint/supports.h" #include "../interface/viewport.h" diff --git a/src/openrct2/ride/vehicle.c b/src/openrct2/ride/vehicle.c index 41cc13061b..63261d081e 100644 --- a/src/openrct2/ride/vehicle.c +++ b/src/openrct2/ride/vehicle.c @@ -16,7 +16,7 @@ #include "../audio/audio.h" #include "../audio/AudioMixer.h" -#include "../config.h" +#include "../config/Config.h" #include "../editor.h" #include "../game.h" #include "../interface/viewport.h" diff --git a/src/openrct2/ride/water/river_rapids.c b/src/openrct2/ride/water/river_rapids.c index cd43bec882..61ec7d4bd3 100644 --- a/src/openrct2/ride/water/river_rapids.c +++ b/src/openrct2/ride/water/river_rapids.c @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../config.h" +#include "../../config/Config.h" #include "../../interface/viewport.h" #include "../../world/sprite.h" #include "../../paint/paint.h" diff --git a/src/openrct2/ride/water/splash_boats.c b/src/openrct2/ride/water/splash_boats.c index 06c4715c6a..06942a85c2 100644 --- a/src/openrct2/ride/water/splash_boats.c +++ b/src/openrct2/ride/water/splash_boats.c @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../config.h" +#include "../../config/Config.h" #include "../../interface/viewport.h" #include "../../paint/paint.h" #include "../../paint/supports.h" diff --git a/src/openrct2/scenario/ScenarioRepository.cpp b/src/openrct2/scenario/ScenarioRepository.cpp index a060df524e..0b13a013ef 100644 --- a/src/openrct2/scenario/ScenarioRepository.cpp +++ b/src/openrct2/scenario/ScenarioRepository.cpp @@ -32,8 +32,9 @@ extern "C" { - #include "../config.h" + #include "../config/Config.h" #include "../localisation/localisation.h" + #include "../platform/platform.h" #include "../rct2.h" #include "scenario.h" } diff --git a/src/openrct2/scenario/scenario.c b/src/openrct2/scenario/scenario.c index b439ee333d..867b29db1b 100644 --- a/src/openrct2/scenario/scenario.c +++ b/src/openrct2/scenario/scenario.c @@ -16,7 +16,7 @@ #include "../audio/audio.h" #include "../cheats.h" -#include "../config.h" +#include "../config/Config.h" #include "../game.h" #include "../interface/viewport.h" #include "../localisation/date.h" diff --git a/src/openrct2/scenario/scenario.h b/src/openrct2/scenario/scenario.h index f6959bda2f..3ca8a91945 100644 --- a/src/openrct2/scenario/scenario.h +++ b/src/openrct2/scenario/scenario.h @@ -21,7 +21,6 @@ #include "../management/finance.h" #include "../management/research.h" #include "../object.h" -#include "../platform/platform.h" #include "../rct12.h" #include "../rct2.h" #include "../rct2/addresses.h" @@ -382,7 +381,7 @@ extern rct_s6_info gS6Info; extern char gScenarioName[64]; extern char gScenarioDetails[256]; extern char gScenarioCompletedBy[32]; -extern char gScenarioSavePath[MAX_PATH]; +extern char gScenarioSavePath[260]; extern char gScenarioExpansionPacks[3256]; extern sint32 gFirstTimeSave; extern uint16 gSavedAge; diff --git a/src/openrct2/title/TitleScreen.cpp b/src/openrct2/title/TitleScreen.cpp index 9bda6890ea..24d02fdcbc 100644 --- a/src/openrct2/title/TitleScreen.cpp +++ b/src/openrct2/title/TitleScreen.cpp @@ -26,7 +26,7 @@ extern "C" { #include "../audio/audio.h" - #include "../config.h" + #include "../config/Config.h" #include "../drawing/drawing.h" #include "../game.h" #include "../input.h" diff --git a/src/openrct2/windows/banner.c b/src/openrct2/windows/banner.c index ac1c58894b..fb3517368a 100644 --- a/src/openrct2/windows/banner.c +++ b/src/openrct2/windows/banner.c @@ -15,7 +15,7 @@ #pragma endregion #include "../game.h" -#include "../config.h" +#include "../config/Config.h" #include "../localisation/localisation.h" #include "../interface/viewport.h" #include "../interface/widget.h" diff --git a/src/openrct2/windows/cheats.c b/src/openrct2/windows/cheats.c index c28ea386e9..d6b166fbea 100644 --- a/src/openrct2/windows/cheats.c +++ b/src/openrct2/windows/cheats.c @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../config.h" +#include "../config/Config.h" #include "../game.h" #include "../interface/widget.h" #include "../interface/window.h" diff --git a/src/openrct2/windows/custom_currency.c b/src/openrct2/windows/custom_currency.c index e5085076cf..f4d1b923f7 100644 --- a/src/openrct2/windows/custom_currency.c +++ b/src/openrct2/windows/custom_currency.c @@ -18,7 +18,7 @@ * 'Custom currency configuration' window definition and logic. */ -#include "../config.h" +#include "../config/Config.h" #include "../localisation/localisation.h" #include "../interface/widget.h" #include "../interface/window.h" diff --git a/src/openrct2/windows/editor_bottom_toolbar.c b/src/openrct2/windows/editor_bottom_toolbar.c index 4cade3a608..d484d7b531 100644 --- a/src/openrct2/windows/editor_bottom_toolbar.c +++ b/src/openrct2/windows/editor_bottom_toolbar.c @@ -15,7 +15,7 @@ #pragma endregion #include "../audio/audio.h" -#include "../config.h" +#include "../config/Config.h" #include "../game.h" #include "../editor.h" #include "../input.h" diff --git a/src/openrct2/windows/editor_object_selection.c b/src/openrct2/windows/editor_object_selection.c index 932fdd8dd1..8adbbb90fe 100644 --- a/src/openrct2/windows/editor_object_selection.c +++ b/src/openrct2/windows/editor_object_selection.c @@ -17,7 +17,7 @@ #pragma warning(disable : 4295) // 'identifier': array is too small to include a terminating null character #include "../audio/audio.h" -#include "../config.h" +#include "../config/Config.h" #include "../game.h" #include "../editor.h" #include "../interface/themes.h" diff --git a/src/openrct2/windows/error.c b/src/openrct2/windows/error.c index 85f03c308b..fe72033904 100644 --- a/src/openrct2/windows/error.c +++ b/src/openrct2/windows/error.c @@ -15,9 +15,10 @@ #pragma endregion #include "../audio/audio.h" -#include "../localisation/localisation.h" #include "../interface/widget.h" #include "../interface/window.h" +#include "../localisation/localisation.h" +#include "../platform/platform.h" #include "../rct2.h" #include "error.h" diff --git a/src/openrct2/windows/finances.c b/src/openrct2/windows/finances.c index 61a6a52419..10bb3d9430 100644 --- a/src/openrct2/windows/finances.c +++ b/src/openrct2/windows/finances.c @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../config.h" +#include "../config/Config.h" #include "../game.h" #include "../interface/graph.h" #include "../interface/widget.h" diff --git a/src/openrct2/windows/game_bottom_toolbar.c b/src/openrct2/windows/game_bottom_toolbar.c index 9b2a1e6ae0..e91d8dff2b 100644 --- a/src/openrct2/windows/game_bottom_toolbar.c +++ b/src/openrct2/windows/game_bottom_toolbar.c @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../config.h" +#include "../config/Config.h" #include "../game.h" #include "../input.h" #include "../interface/themes.h" diff --git a/src/openrct2/windows/guest.c b/src/openrct2/windows/guest.c index 163350a2cc..40bce403d7 100644 --- a/src/openrct2/windows/guest.c +++ b/src/openrct2/windows/guest.c @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../config.h" +#include "../config/Config.h" #include "../game.h" #include "../input.h" #include "../management/marketing.h" diff --git a/src/openrct2/windows/guest_list.c b/src/openrct2/windows/guest_list.c index 5abe455c73..84ac5fa8a0 100644 --- a/src/openrct2/windows/guest_list.c +++ b/src/openrct2/windows/guest_list.c @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../config.h" +#include "../config/Config.h" #include "../game.h" #include "../interface/themes.h" #include "../interface/widget.h" diff --git a/src/openrct2/windows/install_track.c b/src/openrct2/windows/install_track.c index 2cb179e3d7..ae8a3feee5 100644 --- a/src/openrct2/windows/install_track.c +++ b/src/openrct2/windows/install_track.c @@ -20,11 +20,12 @@ #include "../interface/widget.h" #include "../interface/window.h" #include "../localisation/localisation.h" +#include "../object/ObjectManager.h" +#include "../platform/platform.h" #include "../ride/ride.h" #include "../ride/track.h" #include "../ride/track_design.h" #include "../ride/TrackDesignRepository.h" -#include "../object/ObjectManager.h" #include "../sprites.h" #include "../util/util.h" #include "error.h" diff --git a/src/openrct2/windows/loadsave.c b/src/openrct2/windows/loadsave.c index ec4755079e..6dd59d621a 100644 --- a/src/openrct2/windows/loadsave.c +++ b/src/openrct2/windows/loadsave.c @@ -15,7 +15,7 @@ #pragma endregion #include -#include "../config.h" +#include "../config/Config.h" #include "../editor.h" #include "../game.h" #include "../interface/themes.h" diff --git a/src/openrct2/windows/map_tooltip.c b/src/openrct2/windows/map_tooltip.c index 25c82a4c79..8b9c37ad78 100644 --- a/src/openrct2/windows/map_tooltip.c +++ b/src/openrct2/windows/map_tooltip.c @@ -14,10 +14,11 @@ *****************************************************************************/ #pragma endregion -#include "../localisation/localisation.h" #include "../input.h" #include "../interface/widget.h" #include "../interface/window.h" +#include "../localisation/localisation.h" +#include "../platform/platform.h" static rct_widget window_map_tooltip_widgets[] = { { WWT_IMGBTN, 0, 0, 199, 0, 29, 0xFFFFFFFF, STR_NONE }, diff --git a/src/openrct2/windows/multiplayer.c b/src/openrct2/windows/multiplayer.c index d351409c6e..514da162cc 100644 --- a/src/openrct2/windows/multiplayer.c +++ b/src/openrct2/windows/multiplayer.c @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../config.h" +#include "../config/Config.h" #include "../interface/themes.h" #include "../interface/widget.h" #include "../interface/window.h" diff --git a/src/openrct2/windows/new_campaign.c b/src/openrct2/windows/new_campaign.c index 247c6ccf00..204f3b6f7e 100644 --- a/src/openrct2/windows/new_campaign.c +++ b/src/openrct2/windows/new_campaign.c @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../config.h" +#include "../config/Config.h" #include "../game.h" #include "../localisation/localisation.h" #include "../interface/widget.h" diff --git a/src/openrct2/windows/new_ride.c b/src/openrct2/windows/new_ride.c index b6647735fb..796f965277 100644 --- a/src/openrct2/windows/new_ride.c +++ b/src/openrct2/windows/new_ride.c @@ -15,7 +15,7 @@ #pragma endregion #include "../audio/audio.h" -#include "../config.h" +#include "../config/Config.h" #include "../game.h" #include "../interface/widget.h" #include "../interface/window.h" diff --git a/src/openrct2/windows/news_options.c b/src/openrct2/windows/news_options.c index b81d0567fb..026eedef12 100644 --- a/src/openrct2/windows/news_options.c +++ b/src/openrct2/windows/news_options.c @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../config.h" +#include "../config/Config.h" #include "../interface/widget.h" #include "../interface/window.h" #include "../localisation/localisation.h" @@ -33,23 +33,23 @@ typedef struct notification_def { } notification_def; static const notification_def NewsItemOptionDefinitions[] = { - { NOTIFICATION_CATEGORY_PARK, STR_NOTIFICATION_PARK_AWARD, offsetof(notification_configuration, park_award) }, - { NOTIFICATION_CATEGORY_PARK, STR_NOTIFICATION_PARK_MARKETING_CAMPAIGN_FINISHED, offsetof(notification_configuration, park_marketing_campaign_finished) }, - { NOTIFICATION_CATEGORY_PARK, STR_NOTIFICATION_PARK_WARNINGS, offsetof(notification_configuration, park_warnings) }, - { NOTIFICATION_CATEGORY_PARK, STR_NOTIFICATION_PARK_RATING_WARNINGS, offsetof(notification_configuration, park_rating_warnings) }, - { NOTIFICATION_CATEGORY_RIDE, STR_NOTIFICATION_RIDE_BROKEN_DOWN, offsetof(notification_configuration, ride_broken_down) }, - { NOTIFICATION_CATEGORY_RIDE, STR_NOTIFICATION_RIDE_CRASHED, offsetof(notification_configuration, ride_crashed) }, - { NOTIFICATION_CATEGORY_RIDE, STR_NOTIFICATION_RIDE_WARNINGS, offsetof(notification_configuration, ride_warnings) }, - { NOTIFICATION_CATEGORY_RIDE, STR_NOTIFICATION_RIDE_RESEARCHED, offsetof(notification_configuration, ride_researched) }, - { NOTIFICATION_CATEGORY_GUEST, STR_NOTIFICATION_GUEST_WARNINGS, offsetof(notification_configuration, guest_warnings) }, - { NOTIFICATION_CATEGORY_GUEST, STR_NOTIFICATION_GUEST_LOST, offsetof(notification_configuration, guest_lost) }, - { NOTIFICATION_CATEGORY_GUEST, STR_NOTIFICATION_GUEST_LEFT_PARK, offsetof(notification_configuration, guest_left_park) }, - { NOTIFICATION_CATEGORY_GUEST, STR_NOTIFICATION_GUEST_QUEUING_FOR_RIDE, offsetof(notification_configuration, guest_queuing_for_ride) }, - { NOTIFICATION_CATEGORY_GUEST, STR_NOTIFICATION_GUEST_ON_RIDE, offsetof(notification_configuration, guest_on_ride) }, - { NOTIFICATION_CATEGORY_GUEST, STR_NOTIFICATION_GUEST_LEFT_RIDE, offsetof(notification_configuration, guest_left_ride) }, - { NOTIFICATION_CATEGORY_GUEST, STR_NOTIFICATION_GUEST_BOUGHT_ITEM, offsetof(notification_configuration, guest_bought_item) }, - { NOTIFICATION_CATEGORY_GUEST, STR_NOTIFICATION_GUEST_USED_FACILITY, offsetof(notification_configuration, guest_used_facility) }, - { NOTIFICATION_CATEGORY_GUEST, STR_NOTIFICATION_GUEST_DIED, offsetof(notification_configuration, guest_died) }, + { NOTIFICATION_CATEGORY_PARK, STR_NOTIFICATION_PARK_AWARD, offsetof(NotificationConfiguration, park_award) }, + { NOTIFICATION_CATEGORY_PARK, STR_NOTIFICATION_PARK_MARKETING_CAMPAIGN_FINISHED, offsetof(NotificationConfiguration, park_marketing_campaign_finished) }, + { NOTIFICATION_CATEGORY_PARK, STR_NOTIFICATION_PARK_WARNINGS, offsetof(NotificationConfiguration, park_warnings) }, + { NOTIFICATION_CATEGORY_PARK, STR_NOTIFICATION_PARK_RATING_WARNINGS, offsetof(NotificationConfiguration, park_rating_warnings) }, + { NOTIFICATION_CATEGORY_RIDE, STR_NOTIFICATION_RIDE_BROKEN_DOWN, offsetof(NotificationConfiguration, ride_broken_down) }, + { NOTIFICATION_CATEGORY_RIDE, STR_NOTIFICATION_RIDE_CRASHED, offsetof(NotificationConfiguration, ride_crashed) }, + { NOTIFICATION_CATEGORY_RIDE, STR_NOTIFICATION_RIDE_WARNINGS, offsetof(NotificationConfiguration, ride_warnings) }, + { NOTIFICATION_CATEGORY_RIDE, STR_NOTIFICATION_RIDE_RESEARCHED, offsetof(NotificationConfiguration, ride_researched) }, + { NOTIFICATION_CATEGORY_GUEST, STR_NOTIFICATION_GUEST_WARNINGS, offsetof(NotificationConfiguration, guest_warnings) }, + { NOTIFICATION_CATEGORY_GUEST, STR_NOTIFICATION_GUEST_LOST, offsetof(NotificationConfiguration, guest_lost) }, + { NOTIFICATION_CATEGORY_GUEST, STR_NOTIFICATION_GUEST_LEFT_PARK, offsetof(NotificationConfiguration, guest_left_park) }, + { NOTIFICATION_CATEGORY_GUEST, STR_NOTIFICATION_GUEST_QUEUING_FOR_RIDE, offsetof(NotificationConfiguration, guest_queuing_for_ride) }, + { NOTIFICATION_CATEGORY_GUEST, STR_NOTIFICATION_GUEST_ON_RIDE, offsetof(NotificationConfiguration, guest_on_ride) }, + { NOTIFICATION_CATEGORY_GUEST, STR_NOTIFICATION_GUEST_LEFT_RIDE, offsetof(NotificationConfiguration, guest_left_ride) }, + { NOTIFICATION_CATEGORY_GUEST, STR_NOTIFICATION_GUEST_BOUGHT_ITEM, offsetof(NotificationConfiguration, guest_bought_item) }, + { NOTIFICATION_CATEGORY_GUEST, STR_NOTIFICATION_GUEST_USED_FACILITY, offsetof(NotificationConfiguration, guest_used_facility) }, + { NOTIFICATION_CATEGORY_GUEST, STR_NOTIFICATION_GUEST_DIED, offsetof(NotificationConfiguration, guest_died) }, }; enum WINDOW_NEWS_WIDGET_IDX { diff --git a/src/openrct2/windows/options.c b/src/openrct2/windows/options.c index a4562c82d4..db33f67030 100644 --- a/src/openrct2/windows/options.c +++ b/src/openrct2/windows/options.c @@ -24,8 +24,9 @@ #include "../audio/audio.h" #include "../audio/AudioMixer.h" -#include "../config.h" +#include "../config/Config.h" #include "../drawing/drawing.h" +#include "../drawing/IDrawingEngine.h" #include "../interface/themes.h" #include "../interface/viewport.h" #include "../interface/widget.h" diff --git a/src/openrct2/windows/park.c b/src/openrct2/windows/park.c index 9184c614c8..b51a0f2b4f 100644 --- a/src/openrct2/windows/park.c +++ b/src/openrct2/windows/park.c @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../config.h" +#include "../config/Config.h" #include "../game.h" #include "../localisation/date.h" #include "../localisation/localisation.h" diff --git a/src/openrct2/windows/player.c b/src/openrct2/windows/player.c index 4fab90b0a4..e4a809cc49 100644 --- a/src/openrct2/windows/player.c +++ b/src/openrct2/windows/player.c @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../config.h" +#include "../config/Config.h" #include "../game.h" #include "../input.h" #include "../management/marketing.h" diff --git a/src/openrct2/windows/ride.c b/src/openrct2/windows/ride.c index ea7c25fe9a..e8176f75e0 100644 --- a/src/openrct2/windows/ride.c +++ b/src/openrct2/windows/ride.c @@ -16,7 +16,7 @@ #include "../audio/audio.h" #include "../cheats.h" -#include "../config.h" +#include "../config/Config.h" #include "../game.h" #include "../input.h" #include "../interface/themes.h" diff --git a/src/openrct2/windows/ride_construction.c b/src/openrct2/windows/ride_construction.c index 2f45222a2d..97ee941e07 100644 --- a/src/openrct2/windows/ride_construction.c +++ b/src/openrct2/windows/ride_construction.c @@ -16,7 +16,7 @@ #include "../audio/audio.h" #include "../cheats.h" -#include "../config.h" +#include "../config/Config.h" #include "../drawing/drawing.h" #include "../game.h" #include "../input.h" diff --git a/src/openrct2/windows/ride_list.c b/src/openrct2/windows/ride_list.c index 1cd866831e..7522a006b7 100644 --- a/src/openrct2/windows/ride_list.c +++ b/src/openrct2/windows/ride_list.c @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../config.h" +#include "../config/Config.h" #include "../game.h" #include "../ride/ride.h" #include "../localisation/localisation.h" diff --git a/src/openrct2/windows/save_prompt.c b/src/openrct2/windows/save_prompt.c index 14a82a3364..eacc28ae91 100644 --- a/src/openrct2/windows/save_prompt.c +++ b/src/openrct2/windows/save_prompt.c @@ -15,7 +15,7 @@ #pragma endregion #include "../audio/audio.h" -#include "../config.h" +#include "../config/Config.h" #include "../game.h" #include "../localisation/localisation.h" #include "../interface/themes.h" diff --git a/src/openrct2/windows/server_list.c b/src/openrct2/windows/server_list.c index 63e505797b..729aabb888 100644 --- a/src/openrct2/windows/server_list.c +++ b/src/openrct2/windows/server_list.c @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../config.h" +#include "../config/Config.h" #include "../interface/colour.h" #include "../interface/themes.h" #include "../interface/widget.h" diff --git a/src/openrct2/windows/server_start.c b/src/openrct2/windows/server_start.c index 5ccb8d112a..2667ccd5b1 100644 --- a/src/openrct2/windows/server_start.c +++ b/src/openrct2/windows/server_start.c @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../config.h" +#include "../config/Config.h" #include "../interface/themes.h" #include "../interface/widget.h" #include "../interface/window.h" diff --git a/src/openrct2/windows/shortcut_key_change.c b/src/openrct2/windows/shortcut_key_change.c index 90f0f753ab..5a9f60f654 100644 --- a/src/openrct2/windows/shortcut_key_change.c +++ b/src/openrct2/windows/shortcut_key_change.c @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../config.h" +#include "../config/Config.h" #include "../interface/keyboard_shortcut.h" #include "../interface/themes.h" #include "../interface/window.h" diff --git a/src/openrct2/windows/shortcut_keys.c b/src/openrct2/windows/shortcut_keys.c index b361c557d7..29d39cc130 100644 --- a/src/openrct2/windows/shortcut_keys.c +++ b/src/openrct2/windows/shortcut_keys.c @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../config.h" +#include "../config/Config.h" #include "../interface/window.h" #include "../interface/widget.h" #include "../localisation/localisation.h" diff --git a/src/openrct2/windows/sign.c b/src/openrct2/windows/sign.c index ca34ee7794..865e518f50 100644 --- a/src/openrct2/windows/sign.c +++ b/src/openrct2/windows/sign.c @@ -15,7 +15,7 @@ #pragma endregion #include "../game.h" -#include "../config.h" +#include "../config/Config.h" #include "../localisation/localisation.h" #include "../interface/viewport.h" #include "../interface/widget.h" diff --git a/src/openrct2/windows/staff.c b/src/openrct2/windows/staff.c index c9ba7217a0..0665f9ca17 100644 --- a/src/openrct2/windows/staff.c +++ b/src/openrct2/windows/staff.c @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../config.h" +#include "../config/Config.h" #include "../game.h" #include "../interface/viewport.h" #include "../interface/widget.h" diff --git a/src/openrct2/windows/staff_list.c b/src/openrct2/windows/staff_list.c index 5f09ad4e97..496fe73a4b 100644 --- a/src/openrct2/windows/staff_list.c +++ b/src/openrct2/windows/staff_list.c @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../config.h" +#include "../config/Config.h" #include "../drawing/drawing.h" #include "../game.h" #include "../input.h" diff --git a/src/openrct2/windows/text_input.c b/src/openrct2/windows/text_input.c index c3da45c745..b748b6420c 100644 --- a/src/openrct2/windows/text_input.c +++ b/src/openrct2/windows/text_input.c @@ -21,7 +21,7 @@ * that is used for inputing new text for ride names and peep names. */ -#include "../config.h" +#include "../config/Config.h" #include "../platform/platform.h" #include "../interface/window.h" #include "../interface/widget.h" diff --git a/src/openrct2/windows/themes.c b/src/openrct2/windows/themes.c index b5c8db328b..85867e5ec6 100644 --- a/src/openrct2/windows/themes.c +++ b/src/openrct2/windows/themes.c @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../config.h" +#include "../config/Config.h" #include "../game.h" #include "../drawing/drawing.h" #include "../input.h" diff --git a/src/openrct2/windows/title_editor.c b/src/openrct2/windows/title_editor.c index 9dcb7eae06..706bbdd785 100644 --- a/src/openrct2/windows/title_editor.c +++ b/src/openrct2/windows/title_editor.c @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../config.h" +#include "../config/Config.h" #include "../drawing/drawing.h" #include "../game.h" #include "../input.h" diff --git a/src/openrct2/windows/title_exit.c b/src/openrct2/windows/title_exit.c index ac7823f0c5..f2d40c1346 100644 --- a/src/openrct2/windows/title_exit.c +++ b/src/openrct2/windows/title_exit.c @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../config.h" +#include "../config/Config.h" #include "../game.h" #include "../sprites.h" #include "../localisation/localisation.h" diff --git a/src/openrct2/windows/title_menu.c b/src/openrct2/windows/title_menu.c index cd82e98a43..c0126076dc 100644 --- a/src/openrct2/windows/title_menu.c +++ b/src/openrct2/windows/title_menu.c @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../config.h" +#include "../config/Config.h" #include "../editor.h" #include "../game.h" #include "../input.h" diff --git a/src/openrct2/windows/title_options.c b/src/openrct2/windows/title_options.c index 3471b43c97..01a09fcf9c 100644 --- a/src/openrct2/windows/title_options.c +++ b/src/openrct2/windows/title_options.c @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../config.h" +#include "../config/Config.h" #include "../game.h" #include "../intro.h" #include "../localisation/localisation.h" diff --git a/src/openrct2/windows/title_scenarioselect.c b/src/openrct2/windows/title_scenarioselect.c index 38b9d018ab..2383048458 100644 --- a/src/openrct2/windows/title_scenarioselect.c +++ b/src/openrct2/windows/title_scenarioselect.c @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../config.h" +#include "../config/Config.h" #include "../audio/audio.h" #include "../localisation/date.h" #include "../localisation/localisation.h" diff --git a/src/openrct2/windows/top_toolbar.c b/src/openrct2/windows/top_toolbar.c index e5c9eaa87e..4608b1a769 100644 --- a/src/openrct2/windows/top_toolbar.c +++ b/src/openrct2/windows/top_toolbar.c @@ -16,7 +16,7 @@ #include "../audio/audio.h" #include "../cheats.h" -#include "../config.h" +#include "../config/Config.h" #include "../editor.h" #include "../game.h" #include "../input.h" diff --git a/src/openrct2/windows/track_list.c b/src/openrct2/windows/track_list.c index 122182ce26..7f86bcf992 100644 --- a/src/openrct2/windows/track_list.c +++ b/src/openrct2/windows/track_list.c @@ -15,7 +15,8 @@ #pragma endregion #include "../audio/audio.h" -#include "../config.h" +#include "../config/Config.h" +#include "../drawing/IDrawingEngine.h" #include "../editor.h" #include "../interface/themes.h" #include "../interface/widget.h" diff --git a/src/openrct2/windows/view_clipping.c b/src/openrct2/windows/view_clipping.c index 97607d4769..d2ca97cf91 100644 --- a/src/openrct2/windows/view_clipping.c +++ b/src/openrct2/windows/view_clipping.c @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../config.h" +#include "../config/Config.h" #include "../interface/themes.h" #include "../interface/widget.h" #include "../interface/window.h" diff --git a/src/openrct2/world/climate.c b/src/openrct2/world/climate.c index 2d4ab772cb..79c5ca8288 100644 --- a/src/openrct2/world/climate.c +++ b/src/openrct2/world/climate.c @@ -17,7 +17,7 @@ #include "../audio/audio.h" #include "../audio/AudioMixer.h" #include "../cheats.h" -#include "../config.h" +#include "../config/Config.h" #include "../drawing/drawing.h" #include "../game.h" #include "../interface/window.h" diff --git a/src/openrct2/world/map.c b/src/openrct2/world/map.c index 24be817085..98e5d831f3 100644 --- a/src/openrct2/world/map.c +++ b/src/openrct2/world/map.c @@ -17,7 +17,7 @@ #include "../rct2/addresses.h" #include "../audio/audio.h" #include "../cheats.h" -#include "../config.h" +#include "../config/Config.h" #include "../game.h" #include "../interface/Cursors.h" #include "../interface/window.h" diff --git a/src/openrct2/world/park.c b/src/openrct2/world/park.c index 5c5d0b5e1e..6101332ff7 100644 --- a/src/openrct2/world/park.c +++ b/src/openrct2/world/park.c @@ -15,7 +15,7 @@ #pragma endregion #include "../cheats.h" -#include "../config.h" +#include "../config/Config.h" #include "../game.h" #include "../interface/colour.h" #include "../interface/window.h"