From 8b2eb8a13e1299c7a1c4a10f4343057f862f0435 Mon Sep 17 00:00:00 2001 From: Ted John Date: Fri, 28 Jul 2017 19:44:13 +0100 Subject: [PATCH] Move screen variables to OpenRCT2.h --- src/openrct2-ui/audio/AudioMixer.cpp | 1 - src/openrct2-ui/input/keyboard_shortcut.c | 1 + src/openrct2/Context.cpp | 1 - src/openrct2/OpenRCT2.cpp | 6 +++- src/openrct2/OpenRCT2.h | 17 ++++++++++ src/openrct2/PlatformEnvironment.cpp | 1 - src/openrct2/audio/AudioMixer.cpp | 5 --- src/openrct2/cmdline/ConvertCommand.cpp | 1 - src/openrct2/drawing/NewDrawing.cpp | 1 - src/openrct2/drawing/NewDrawing.h | 1 - src/openrct2/drawing/X8DrawingEngine.cpp | 1 - src/openrct2/drawing/drawing.c | 1 - src/openrct2/drawing/lightfx.c | 1 - src/openrct2/drawing/ttf.c | 2 +- src/openrct2/editor.c | 1 + src/openrct2/editor.h | 1 - src/openrct2/input.c | 1 - src/openrct2/interface/Screenshot.cpp | 1 - src/openrct2/interface/chat.c | 1 - src/openrct2/interface/console.c | 2 +- src/openrct2/interface/viewport.c | 1 - src/openrct2/interface/viewport_interaction.c | 1 + src/openrct2/interface/window.c | 1 + src/openrct2/intro.c | 1 - src/openrct2/management/news_item.c | 2 +- src/openrct2/management/research.c | 1 + src/openrct2/network/twitch.cpp | 2 +- src/openrct2/object/ObjectRepository.cpp | 1 - src/openrct2/paint/Painter.cpp | 1 + src/openrct2/paint/map_element/surface.c | 2 +- src/openrct2/peep/peep.c | 1 - src/openrct2/rct1.h | 1 - src/openrct2/rct2.c | 31 ------------------- src/openrct2/rct2.h | 25 --------------- src/openrct2/rct2/S6Exporter.cpp | 1 - src/openrct2/rct2/S6Importer.cpp | 1 - src/openrct2/ride/TrackDesignRepository.cpp | 1 - src/openrct2/ride/ride.c | 1 + src/openrct2/ride/ride_ratings.c | 2 +- src/openrct2/ride/track_design.c | 1 + src/openrct2/scenario/ScenarioRepository.cpp | 1 - src/openrct2/title/TitleSequencePlayer.cpp | 1 + src/openrct2/windows/changelog.c | 1 - src/openrct2/windows/clear_scenery.c | 1 - src/openrct2/windows/debug_paint.c | 1 - src/openrct2/windows/dropdown.c | 1 - src/openrct2/windows/editor_bottom_toolbar.c | 1 + src/openrct2/windows/editor_inventions_list.c | 1 + src/openrct2/windows/editor_main.c | 1 - .../windows/editor_object_selection.c | 1 + .../windows/editor_objective_options.c | 2 +- .../windows/editor_scenario_options.c | 2 +- src/openrct2/windows/error.c | 1 - src/openrct2/windows/footpath.c | 2 +- src/openrct2/windows/game_bottom_toolbar.c | 2 +- src/openrct2/windows/land.c | 3 -- src/openrct2/windows/land_rights.c | 1 - src/openrct2/windows/main.c | 1 - src/openrct2/windows/map.c | 2 +- src/openrct2/windows/new_ride.c | 1 + src/openrct2/windows/options.c | 1 - src/openrct2/windows/park.c | 1 - src/openrct2/windows/ride.c | 2 +- src/openrct2/windows/save_prompt.c | 1 - src/openrct2/windows/scenery.c | 1 - src/openrct2/windows/staff_list.c | 1 - src/openrct2/windows/title_command_editor.c | 2 +- src/openrct2/windows/title_editor.c | 1 + src/openrct2/windows/title_exit.c | 1 - src/openrct2/windows/title_options.c | 1 - src/openrct2/windows/tooltip.c | 1 - src/openrct2/windows/top_toolbar.c | 1 + src/openrct2/windows/track_list.c | 1 + src/openrct2/windows/track_manage.c | 1 - src/openrct2/windows/view_clipping.c | 1 - src/openrct2/windows/water.c | 1 - src/openrct2/world/Climate.cpp | 2 +- src/openrct2/world/SmallScenery.cpp | 4 +-- src/openrct2/world/entrance.cpp | 2 +- src/openrct2/world/footpath.c | 2 +- src/openrct2/world/map.c | 1 - src/openrct2/world/park.c | 2 +- src/openrct2/world/wall.cpp | 1 + 83 files changed, 57 insertions(+), 127 deletions(-) delete mode 100644 src/openrct2/rct2.c diff --git a/src/openrct2-ui/audio/AudioMixer.cpp b/src/openrct2-ui/audio/AudioMixer.cpp index c8a6e9111b..f7d51a96ff 100644 --- a/src/openrct2-ui/audio/AudioMixer.cpp +++ b/src/openrct2-ui/audio/AudioMixer.cpp @@ -36,7 +36,6 @@ extern "C" #include #include #include - #include } namespace OpenRCT2 { namespace Audio diff --git a/src/openrct2-ui/input/keyboard_shortcut.c b/src/openrct2-ui/input/keyboard_shortcut.c index 138a01c4b4..5e3758c586 100644 --- a/src/openrct2-ui/input/keyboard_shortcut.c +++ b/src/openrct2-ui/input/keyboard_shortcut.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include diff --git a/src/openrct2/Context.cpp b/src/openrct2/Context.cpp index 8dcffd50ae..3576ebff9c 100644 --- a/src/openrct2/Context.cpp +++ b/src/openrct2/Context.cpp @@ -63,7 +63,6 @@ extern "C" #include "object_list.h" #include "platform/platform.h" #include "rct1.h" - #include "rct2.h" #include "rct2/interop.h" #include "util/util.h" } diff --git a/src/openrct2/OpenRCT2.cpp b/src/openrct2/OpenRCT2.cpp index e7438ef25e..349c0d1d49 100644 --- a/src/openrct2/OpenRCT2.cpp +++ b/src/openrct2/OpenRCT2.cpp @@ -23,7 +23,6 @@ extern "C" { #include "audio/audio.h" #include "platform/platform.h" - #include "rct2.h" } extern "C" @@ -47,4 +46,9 @@ extern "C" // OpenSSL's message digest context used for calculating sprite checksums EVP_MD_CTX * gHashCTX = nullptr; #endif // DISABLE_NETWORK + + uint32 gCurrentDrawCount = 0; + uint8 gScreenFlags; + uint32 gScreenAge; + uint8 gSavePromptMode; } diff --git a/src/openrct2/OpenRCT2.h b/src/openrct2/OpenRCT2.h index 2dac6374f9..5c42d9d591 100644 --- a/src/openrct2/OpenRCT2.h +++ b/src/openrct2/OpenRCT2.h @@ -37,6 +37,18 @@ enum STARTUP_ACTION STARTUP_ACTION_EDIT }; +enum +{ + // Although this is labeled a flag it actually means when + // zero the screen is in playing mode. + SCREEN_FLAGS_PLAYING = 0, + SCREEN_FLAGS_TITLE_DEMO = 1, + SCREEN_FLAGS_SCENARIO_EDITOR = 2, + SCREEN_FLAGS_TRACK_DESIGNER = 4, + SCREEN_FLAGS_TRACK_MANAGER = 8, + SCREEN_FLAGS_EDITOR = (SCREEN_FLAGS_SCENARIO_EDITOR | SCREEN_FLAGS_TRACK_DESIGNER | SCREEN_FLAGS_TRACK_MANAGER), +}; + #ifdef __cplusplus extern "C" { @@ -67,6 +79,11 @@ extern "C" extern char* gNetworkStartAddress; #endif + extern uint32 gCurrentDrawCount; + extern uint8 gScreenFlags; + extern uint32 gScreenAge; + extern uint8 gSavePromptMode; + void openrct2_write_full_version_info(utf8 * buffer, size_t bufferSize); void openrct2_finish(); diff --git a/src/openrct2/PlatformEnvironment.cpp b/src/openrct2/PlatformEnvironment.cpp index 56cb558033..14c4733043 100644 --- a/src/openrct2/PlatformEnvironment.cpp +++ b/src/openrct2/PlatformEnvironment.cpp @@ -27,7 +27,6 @@ extern "C" { #include "platform/platform.h" - #include "rct2.h" } using namespace OpenRCT2; diff --git a/src/openrct2/audio/AudioMixer.cpp b/src/openrct2/audio/AudioMixer.cpp index 673ef1058c..955ef4170b 100644 --- a/src/openrct2/audio/AudioMixer.cpp +++ b/src/openrct2/audio/AudioMixer.cpp @@ -23,11 +23,6 @@ #include "AudioMixer.h" #include "AudioSource.h" -extern "C" -{ - #include "../rct2.h" -} - using namespace OpenRCT2; using namespace OpenRCT2::Audio; diff --git a/src/openrct2/cmdline/ConvertCommand.cpp b/src/openrct2/cmdline/ConvertCommand.cpp index cbc441b283..31374dbe2f 100644 --- a/src/openrct2/cmdline/ConvertCommand.cpp +++ b/src/openrct2/cmdline/ConvertCommand.cpp @@ -30,7 +30,6 @@ extern "C" #include "../game.h" #include "../interface/window.h" #include "../OpenRCT2.h" - #include "../rct2.h" } static void WriteConvertFromAndToMessage(uint32 sourceFileType, uint32 destinationFileType); diff --git a/src/openrct2/drawing/NewDrawing.cpp b/src/openrct2/drawing/NewDrawing.cpp index c772a5c825..a498cfcd67 100644 --- a/src/openrct2/drawing/NewDrawing.cpp +++ b/src/openrct2/drawing/NewDrawing.cpp @@ -31,7 +31,6 @@ extern "C" #include "../drawing/drawing.h" #include "../localisation/string_ids.h" #include "../platform/platform.h" - #include "../rct2.h" } using namespace OpenRCT2; diff --git a/src/openrct2/drawing/NewDrawing.h b/src/openrct2/drawing/NewDrawing.h index 54c4042605..09effc0a34 100644 --- a/src/openrct2/drawing/NewDrawing.h +++ b/src/openrct2/drawing/NewDrawing.h @@ -21,7 +21,6 @@ extern "C" { #endif -#include "../rct2.h" #include "drawing.h" extern rct_string_id DrawingEngineStringIds[3]; diff --git a/src/openrct2/drawing/X8DrawingEngine.cpp b/src/openrct2/drawing/X8DrawingEngine.cpp index c927d431ad..a716b08447 100644 --- a/src/openrct2/drawing/X8DrawingEngine.cpp +++ b/src/openrct2/drawing/X8DrawingEngine.cpp @@ -33,7 +33,6 @@ extern "C" #include "../interface/window.h" #include "../intro.h" #include "../platform/platform.h" - #include "../rct2.h" #include "drawing.h" #include "lightfx.h" } diff --git a/src/openrct2/drawing/drawing.c b/src/openrct2/drawing/drawing.c index f535efb0ea..6448f6418b 100644 --- a/src/openrct2/drawing/drawing.c +++ b/src/openrct2/drawing/drawing.c @@ -22,7 +22,6 @@ #include "../object.h" #include "../OpenRCT2.h" #include "../platform/platform.h" -#include "../rct2.h" #include "../world/water.h" #include "drawing.h" diff --git a/src/openrct2/drawing/lightfx.c b/src/openrct2/drawing/lightfx.c index c37b98a11a..7b3c79bd75 100644 --- a/src/openrct2/drawing/lightfx.c +++ b/src/openrct2/drawing/lightfx.c @@ -18,7 +18,6 @@ #include "../common.h" #include "../game.h" -#include "../rct2.h" #include "../interface/viewport.h" #include "../interface/window.h" #include "../paint/map_element/map_element.h" diff --git a/src/openrct2/drawing/ttf.c b/src/openrct2/drawing/ttf.c index 4a2772d72f..a31bb3b6a7 100644 --- a/src/openrct2/drawing/ttf.c +++ b/src/openrct2/drawing/ttf.c @@ -20,8 +20,8 @@ #include FT_FREETYPE_H #include "../localisation/localisation.h" +#include "../OpenRCT2.h" #include "../platform/platform.h" -#include "../rct2.h" #include "ttf.h" static bool _ttfInitialised = false; diff --git a/src/openrct2/editor.c b/src/openrct2/editor.c index 438544406e..df732506c0 100644 --- a/src/openrct2/editor.c +++ b/src/openrct2/editor.c @@ -28,6 +28,7 @@ #include "network/network.h" #include "object.h" #include "object/ObjectManager.h" +#include "OpenRCT2.h" #include "peep/staff.h" #include "platform/platform.h" #include "rct1.h" diff --git a/src/openrct2/editor.h b/src/openrct2/editor.h index 5ea978e1d4..898b409116 100644 --- a/src/openrct2/editor.h +++ b/src/openrct2/editor.h @@ -18,7 +18,6 @@ #define _EDITOR_H_ #include "object.h" -#include "rct2.h" typedef enum { EDITOR_STEP_OBJECT_SELECTION, // 0 diff --git a/src/openrct2/input.c b/src/openrct2/input.c index aaa8f8d39a..77ebcb289d 100644 --- a/src/openrct2/input.c +++ b/src/openrct2/input.c @@ -36,7 +36,6 @@ #include "world/sprite.h" #include "world/scenery.h" #include "OpenRCT2.h" -#include "rct2.h" typedef struct rct_mouse_data { uint32 x; diff --git a/src/openrct2/interface/Screenshot.cpp b/src/openrct2/interface/Screenshot.cpp index 713283fc1b..4a6e649e8c 100644 --- a/src/openrct2/interface/Screenshot.cpp +++ b/src/openrct2/interface/Screenshot.cpp @@ -30,7 +30,6 @@ extern "C" #include "../intro.h" #include "../localisation/localisation.h" #include "../platform/platform.h" - #include "../rct2.h" #include "../util/util.h" #include "../windows/error.h" #include "viewport.h" diff --git a/src/openrct2/interface/chat.c b/src/openrct2/interface/chat.c index b9b614d965..846ce3dde9 100644 --- a/src/openrct2/interface/chat.c +++ b/src/openrct2/interface/chat.c @@ -21,7 +21,6 @@ #include "../localisation/localisation.h" #include "../network/network.h" #include "../platform/platform.h" -#include "../rct2.h" #include "../util/util.h" #include "chat.h" diff --git a/src/openrct2/interface/console.c b/src/openrct2/interface/console.c index 883ded100c..b4216bf6f2 100644 --- a/src/openrct2/interface/console.c +++ b/src/openrct2/interface/console.c @@ -30,9 +30,9 @@ #include "../object.h" #include "../object/ObjectManager.h" #include "../object/ObjectRepository.h" +#include "../OpenRCT2.h" #include "../peep/staff.h" #include "../platform/platform.h" -#include "../rct2.h" #include "../ride/ride.h" #include "../ride/ride_data.h" #include "../util/sawyercoding.h" diff --git a/src/openrct2/interface/viewport.c b/src/openrct2/interface/viewport.c index c2b38da80a..e733bb7501 100644 --- a/src/openrct2/interface/viewport.c +++ b/src/openrct2/interface/viewport.c @@ -23,7 +23,6 @@ #include "../paint/paint.h" #include "../paint/supports.h" #include "../peep/staff.h" -#include "../rct2.h" #include "../ride/ride_data.h" #include "../ride/track_data.h" #include "../world/banner.h" diff --git a/src/openrct2/interface/viewport_interaction.c b/src/openrct2/interface/viewport_interaction.c index 44357f1603..e700313cf8 100644 --- a/src/openrct2/interface/viewport_interaction.c +++ b/src/openrct2/interface/viewport_interaction.c @@ -19,6 +19,7 @@ #include "../game.h" #include "../input.h" #include "../localisation/localisation.h" +#include "../OpenRCT2.h" #include "../ride/ride.h" #include "../ride/ride_data.h" #include "../ride/track.h" diff --git a/src/openrct2/interface/window.c b/src/openrct2/interface/window.c index 73f891011a..ef3df6ca08 100644 --- a/src/openrct2/interface/window.c +++ b/src/openrct2/interface/window.c @@ -26,6 +26,7 @@ #include "../interface/themes.h" #include "../localisation/localisation.h" #include "../localisation/string_ids.h" +#include "../OpenRCT2.h" #include "../platform/platform.h" #include "../world/map.h" #include "../world/sprite.h" diff --git a/src/openrct2/intro.c b/src/openrct2/intro.c index 350a4e9f3c..f4e41f5347 100644 --- a/src/openrct2/intro.c +++ b/src/openrct2/intro.c @@ -19,7 +19,6 @@ #include "Context.h" #include "drawing/drawing.h" #include "intro.h" -#include "rct2.h" #include "sprites.h" #define BACKROUND_COLOUR_DARK PALETTE_INDEX_10 diff --git a/src/openrct2/management/news_item.c b/src/openrct2/management/news_item.c index 77629a74b1..c5704e0097 100644 --- a/src/openrct2/management/news_item.c +++ b/src/openrct2/management/news_item.c @@ -20,7 +20,7 @@ #include "../interface/window.h" #include "../localisation/date.h" #include "../localisation/localisation.h" -#include "../rct2.h" +#include "../OpenRCT2.h" #include "../ride/ride.h" #include "../util/util.h" #include "../world/sprite.h" diff --git a/src/openrct2/management/research.c b/src/openrct2/management/research.c index 593ff94124..1413c106d6 100644 --- a/src/openrct2/management/research.c +++ b/src/openrct2/management/research.c @@ -22,6 +22,7 @@ #include "../localisation/localisation.h" #include "../localisation/string_ids.h" #include "../management/finance.h" +#include "../OpenRCT2.h" #include "../scenario/scenario.h" #include "../rct1.h" #include "../ride/ride.h" diff --git a/src/openrct2/network/twitch.cpp b/src/openrct2/network/twitch.cpp index 181a275cd8..b0a2597f73 100644 --- a/src/openrct2/network/twitch.cpp +++ b/src/openrct2/network/twitch.cpp @@ -32,6 +32,7 @@ #include #include "../core/Math.hpp" #include "../core/String.hpp" +#include "../OpenRCT2.h" extern "C" { @@ -43,7 +44,6 @@ extern "C" #include "../management/news_item.h" #include "../peep/peep.h" #include "../platform/platform.h" - #include "../rct2.h" #include "../util/util.h" #include "../world/sprite.h" #include "http.h" diff --git a/src/openrct2/object/ObjectRepository.cpp b/src/openrct2/object/ObjectRepository.cpp index 7f74c8ba46..ce262302fe 100644 --- a/src/openrct2/object/ObjectRepository.cpp +++ b/src/openrct2/object/ObjectRepository.cpp @@ -48,7 +48,6 @@ extern "C" #include "../object.h" #include "../object_list.h" #include "../platform/platform.h" - #include "../rct2.h" #include "../util/sawyercoding.h" #include "../util/util.h" } diff --git a/src/openrct2/paint/Painter.cpp b/src/openrct2/paint/Painter.cpp index 81c8d04f08..38280cce86 100644 --- a/src/openrct2/paint/Painter.cpp +++ b/src/openrct2/paint/Painter.cpp @@ -16,6 +16,7 @@ #include "../config/Config.h" #include "../drawing/IDrawingEngine.h" +#include "../OpenRCT2.h" #include "../title/TitleScreen.h" #include "../ui/UiContext.h" #include "Painter.h" diff --git a/src/openrct2/paint/map_element/surface.c b/src/openrct2/paint/map_element/surface.c index 9106f0803e..c93b9af73f 100644 --- a/src/openrct2/paint/map_element/surface.c +++ b/src/openrct2/paint/map_element/surface.c @@ -17,8 +17,8 @@ #include "../../cheats.h" #include "../../config/Config.h" #include "../../interface/viewport.h" +#include "../../OpenRCT2.h" #include "../../peep/staff.h" -#include "../../rct2.h" #include "../../sprites.h" #include "map_element.h" #include "surface.h" diff --git a/src/openrct2/peep/peep.c b/src/openrct2/peep/peep.c index 91c073ae5c..90c2574e6b 100644 --- a/src/openrct2/peep/peep.c +++ b/src/openrct2/peep/peep.c @@ -28,7 +28,6 @@ #include "../management/news_item.h" #include "../network/network.h" #include "../OpenRCT2.h" -#include "../rct2.h" #include "../ride/ride.h" #include "../ride/ride_data.h" #include "../ride/station.h" diff --git a/src/openrct2/rct1.h b/src/openrct2/rct1.h index 7d045e5f79..9c31a67509 100644 --- a/src/openrct2/rct1.h +++ b/src/openrct2/rct1.h @@ -21,7 +21,6 @@ #include "management/news_item.h" #include "management/research.h" #include "rct12.h" -#include "rct2.h" #include "ride/ride.h" #include "world/banner.h" #include "world/map.h" diff --git a/src/openrct2/rct2.c b/src/openrct2/rct2.c deleted file mode 100644 index c87a129d1a..0000000000 --- a/src/openrct2/rct2.c +++ /dev/null @@ -1,31 +0,0 @@ -#pragma region Copyright (c) 2014-2017 OpenRCT2 Developers -/***************************************************************************** - * OpenRCT2, an open source clone of Roller Coaster Tycoon 2. - * - * OpenRCT2 is the work of many authors, a full list can be found in contributors.md - * For more information, visit https://github.com/OpenRCT2/OpenRCT2 - * - * OpenRCT2 is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * A full copy of the GNU General Public License can be found in licence.txt - *****************************************************************************/ -#pragma endregion - -#pragma warning(disable : 4996) // GetVersionExA deprecated - -#include -#include "audio/audio.h" -#include "config/Config.h" -#include "Context.h" -#include "OpenRCT2.h" -#include "platform/platform.h" -#include "util/util.h" - -uint32 gCurrentDrawCount = 0; - -uint8 gScreenFlags; -uint32 gScreenAge; -uint8 gSavePromptMode; diff --git a/src/openrct2/rct2.h b/src/openrct2/rct2.h index eb3267e915..8cd3344e67 100644 --- a/src/openrct2/rct2.h +++ b/src/openrct2/rct2.h @@ -76,29 +76,4 @@ assert_struct_size(rct_scores_entry, 0x02B0); #pragma pack(pop) -enum { - // Although this is labeled a flag it actually means when - // zero the screen is in playing mode. - SCREEN_FLAGS_PLAYING = 0, - SCREEN_FLAGS_TITLE_DEMO = 1, - SCREEN_FLAGS_SCENARIO_EDITOR = 2, - SCREEN_FLAGS_TRACK_DESIGNER = 4, - SCREEN_FLAGS_TRACK_MANAGER = 8, -}; - -#define SCREEN_FLAGS_EDITOR (SCREEN_FLAGS_SCENARIO_EDITOR | SCREEN_FLAGS_TRACK_DESIGNER | SCREEN_FLAGS_TRACK_MANAGER) - -#ifdef __cplusplus -extern "C" { -#endif - -extern uint32 gCurrentDrawCount; -extern uint8 gScreenFlags; -extern uint32 gScreenAge; -extern uint8 gSavePromptMode; - -#ifdef __cplusplus -} -#endif - #endif diff --git a/src/openrct2/rct2/S6Exporter.cpp b/src/openrct2/rct2/S6Exporter.cpp index e5c12f755a..59670bbf55 100644 --- a/src/openrct2/rct2/S6Exporter.cpp +++ b/src/openrct2/rct2/S6Exporter.cpp @@ -42,7 +42,6 @@ extern "C" #include "../object.h" #include "../OpenRCT2.h" #include "../peep/staff.h" - #include "../rct2.h" #include "../ride/ride.h" #include "../ride/ride_ratings.h" #include "../ride/track_data.h" diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index 5f81a8cad8..171cc18ec0 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -42,7 +42,6 @@ extern "C" #include "../management/research.h" #include "../OpenRCT2.h" #include "../peep/staff.h" - #include "../rct2.h" #include "../ride/ride.h" #include "../ride/ride_ratings.h" #include "../scenario/scenario.h" diff --git a/src/openrct2/ride/TrackDesignRepository.cpp b/src/openrct2/ride/TrackDesignRepository.cpp index 239bfebad3..fa39260632 100644 --- a/src/openrct2/ride/TrackDesignRepository.cpp +++ b/src/openrct2/ride/TrackDesignRepository.cpp @@ -33,7 +33,6 @@ extern "C" { - #include "../rct2.h" #include "track_design.h" } diff --git a/src/openrct2/ride/ride.c b/src/openrct2/ride/ride.c index 4bc53868fb..c0158dc3a8 100644 --- a/src/openrct2/ride/ride.c +++ b/src/openrct2/ride/ride.c @@ -31,6 +31,7 @@ #include "../management/news_item.h" #include "../network/network.h" #include "../object_list.h" +#include "../OpenRCT2.h" #include "../peep/peep.h" #include "../peep/staff.h" #include "../rct1.h" diff --git a/src/openrct2/ride/ride_ratings.c b/src/openrct2/ride/ride_ratings.c index 8b5e1f89b1..c70a822c0d 100644 --- a/src/openrct2/ride/ride_ratings.c +++ b/src/openrct2/ride/ride_ratings.c @@ -17,7 +17,7 @@ #include "../cheats.h" #include "../interface/window.h" #include "../localisation/date.h" -#include "../rct2.h" +#include "../OpenRCT2.h" #include "../world/map.h" #include "ride.h" #include "ride_data.h" diff --git a/src/openrct2/ride/track_design.c b/src/openrct2/ride/track_design.c index ec732d60d6..17f01b672d 100644 --- a/src/openrct2/ride/track_design.c +++ b/src/openrct2/ride/track_design.c @@ -23,6 +23,7 @@ #include "../network/network.h" #include "../object/ObjectManager.h" #include "../object/ObjectRepository.h" +#include "../OpenRCT2.h" #include "../rct1.h" #include "../rct1/Tables.h" #include "../util/sawyercoding.h" diff --git a/src/openrct2/scenario/ScenarioRepository.cpp b/src/openrct2/scenario/ScenarioRepository.cpp index 332a0edb7b..7595709f7a 100644 --- a/src/openrct2/scenario/ScenarioRepository.cpp +++ b/src/openrct2/scenario/ScenarioRepository.cpp @@ -35,7 +35,6 @@ extern "C" #include "../config/Config.h" #include "../localisation/localisation.h" #include "../platform/platform.h" - #include "../rct2.h" #include "scenario.h" } diff --git a/src/openrct2/title/TitleSequencePlayer.cpp b/src/openrct2/title/TitleSequencePlayer.cpp index b35f60ca77..90d04fe7cc 100644 --- a/src/openrct2/title/TitleSequencePlayer.cpp +++ b/src/openrct2/title/TitleSequencePlayer.cpp @@ -23,6 +23,7 @@ #include "../core/Math.hpp" #include "../core/Path.hpp" #include "../core/String.hpp" +#include "../OpenRCT2.h" #include "../ParkImporter.h" #include "../scenario/ScenarioRepository.h" #include "../scenario/ScenarioSources.h" diff --git a/src/openrct2/windows/changelog.c b/src/openrct2/windows/changelog.c index 8978fbe9c6..757434d67b 100644 --- a/src/openrct2/windows/changelog.c +++ b/src/openrct2/windows/changelog.c @@ -22,7 +22,6 @@ #include "../localisation/localisation.h" #include "../OpenRCT2.h" #include "../platform/platform.h" -#include "../rct2.h" #include "../util/util.h" #include "../world/footpath.h" #include "../world/map.h" diff --git a/src/openrct2/windows/clear_scenery.c b/src/openrct2/windows/clear_scenery.c index 2ff82665fc..513108fb14 100644 --- a/src/openrct2/windows/clear_scenery.c +++ b/src/openrct2/windows/clear_scenery.c @@ -20,7 +20,6 @@ #include "../interface/widget.h" #include "../interface/window.h" #include "../localisation/localisation.h" -#include "../rct2.h" #include "../sprites.h" #include "../world/map.h" #include "../world/scenery.h" diff --git a/src/openrct2/windows/debug_paint.c b/src/openrct2/windows/debug_paint.c index d40557f10b..f7bea8e282 100644 --- a/src/openrct2/windows/debug_paint.c +++ b/src/openrct2/windows/debug_paint.c @@ -21,7 +21,6 @@ #include "../localisation/localisation.h" #include "../paint/map_element/map_element.h" #include "../paint/paint.h" -#include "../rct2.h" #include "../ride/track_paint.h" #include "../sprites.h" #include "../world/map.h" diff --git a/src/openrct2/windows/dropdown.c b/src/openrct2/windows/dropdown.c index 51153e5dc6..4ca3b7e938 100644 --- a/src/openrct2/windows/dropdown.c +++ b/src/openrct2/windows/dropdown.c @@ -19,7 +19,6 @@ #include "../interface/widget.h" #include "../interface/window.h" #include "../localisation/localisation.h" -#include "../rct2.h" #include "../scenario/scenario.h" #include "../sprites.h" #include "dropdown.h" diff --git a/src/openrct2/windows/editor_bottom_toolbar.c b/src/openrct2/windows/editor_bottom_toolbar.c index 53b5a7d012..9324902fc9 100644 --- a/src/openrct2/windows/editor_bottom_toolbar.c +++ b/src/openrct2/windows/editor_bottom_toolbar.c @@ -28,6 +28,7 @@ #include "../interface/viewport.h" #include "../interface/widget.h" #include "../interface/window.h" +#include "../OpenRCT2.h" #include "../platform/platform.h" #include "../ride/track_data.h" #include "../util/util.h" diff --git a/src/openrct2/windows/editor_inventions_list.c b/src/openrct2/windows/editor_inventions_list.c index 907642ee7f..f52b169f98 100644 --- a/src/openrct2/windows/editor_inventions_list.c +++ b/src/openrct2/windows/editor_inventions_list.c @@ -24,6 +24,7 @@ #include "../object.h" #include "../object/ObjectManager.h" #include "../object/ObjectRepository.h" +#include "../OpenRCT2.h" #include "../rct1.h" #include "../sprites.h" #include "../util/util.h" diff --git a/src/openrct2/windows/editor_main.c b/src/openrct2/windows/editor_main.c index a6884b0720..6d41e5f70c 100644 --- a/src/openrct2/windows/editor_main.c +++ b/src/openrct2/windows/editor_main.c @@ -18,7 +18,6 @@ #include "../interface/viewport.h" #include "../interface/widget.h" #include "../interface/window.h" -#include "../rct2.h" #include "../world/footpath.h" static void window_editor_main_paint(rct_window *w, rct_drawpixelinfo *dpi); diff --git a/src/openrct2/windows/editor_object_selection.c b/src/openrct2/windows/editor_object_selection.c index d81d4cfeed..aa98e371d8 100644 --- a/src/openrct2/windows/editor_object_selection.c +++ b/src/openrct2/windows/editor_object_selection.c @@ -30,6 +30,7 @@ #include "../object_list.h" #include "../object/ObjectManager.h" #include "../object/ObjectRepository.h" +#include "../OpenRCT2.h" #include "../platform/platform.h" #include "../rct1.h" #include "../ride/ride.h" diff --git a/src/openrct2/windows/editor_objective_options.c b/src/openrct2/windows/editor_objective_options.c index bbc9668944..d4dd8cb139 100644 --- a/src/openrct2/windows/editor_objective_options.c +++ b/src/openrct2/windows/editor_objective_options.c @@ -19,7 +19,7 @@ #include "../interface/window.h" #include "../localisation/date.h" #include "../localisation/localisation.h" -#include "../rct2.h" +#include "../OpenRCT2.h" #include "../scenario/scenario.h" #include "../sprites.h" #include "../util/util.h" diff --git a/src/openrct2/windows/editor_scenario_options.c b/src/openrct2/windows/editor_scenario_options.c index e42e9b2fc3..046ad2ab9e 100644 --- a/src/openrct2/windows/editor_scenario_options.c +++ b/src/openrct2/windows/editor_scenario_options.c @@ -20,7 +20,7 @@ #include "../interface/window.h" #include "../localisation/localisation.h" #include "../management/finance.h" -#include "../rct2.h" +#include "../OpenRCT2.h" #include "../sprites.h" #include "dropdown.h" #include "error.h" diff --git a/src/openrct2/windows/error.c b/src/openrct2/windows/error.c index d23a9d0314..bb94f308f3 100644 --- a/src/openrct2/windows/error.c +++ b/src/openrct2/windows/error.c @@ -21,7 +21,6 @@ #include "../localisation/localisation.h" #include "../OpenRCT2.h" #include "../platform/platform.h" -#include "../rct2.h" #include "error.h" bool gDisableErrorWindowSound = false; diff --git a/src/openrct2/windows/footpath.c b/src/openrct2/windows/footpath.c index e56e4e8259..79fc79d579 100644 --- a/src/openrct2/windows/footpath.c +++ b/src/openrct2/windows/footpath.c @@ -21,7 +21,7 @@ #include "../interface/viewport.h" #include "../interface/widget.h" #include "../localisation/localisation.h" -#include "../rct2.h" +#include "../OpenRCT2.h" #include "../sprites.h" #include "../world/footpath.h" #include "dropdown.h" diff --git a/src/openrct2/windows/game_bottom_toolbar.c b/src/openrct2/windows/game_bottom_toolbar.c index 3d812057fa..32cdd4de27 100644 --- a/src/openrct2/windows/game_bottom_toolbar.c +++ b/src/openrct2/windows/game_bottom_toolbar.c @@ -24,9 +24,9 @@ #include "../localisation/localisation.h" #include "../management/finance.h" #include "../management/news_item.h" +#include "../OpenRCT2.h" #include "../peep/peep.h" #include "../peep/staff.h" -#include "../rct2.h" #include "../sprites.h" #include "../world/Climate.h" #include "../world/park.h" diff --git a/src/openrct2/windows/land.c b/src/openrct2/windows/land.c index 95dfea3d26..ea88ff4a1d 100644 --- a/src/openrct2/windows/land.c +++ b/src/openrct2/windows/land.c @@ -20,13 +20,10 @@ #include "../interface/widget.h" #include "../interface/window.h" #include "../localisation/localisation.h" -#include "../rct2.h" #include "../sprites.h" #include "../world/map.h" #include "dropdown.h" - - enum WINDOW_LAND_WIDGET_IDX { WIDX_BACKGROUND, WIDX_TITLE, diff --git a/src/openrct2/windows/land_rights.c b/src/openrct2/windows/land_rights.c index d222b2dc36..9b084d06c8 100644 --- a/src/openrct2/windows/land_rights.c +++ b/src/openrct2/windows/land_rights.c @@ -22,7 +22,6 @@ #include "../interface/widget.h" #include "../interface/window.h" #include "../localisation/localisation.h" -#include "../rct2.h" #include "../sprites.h" #include "../world/map.h" diff --git a/src/openrct2/windows/main.c b/src/openrct2/windows/main.c index 989ef831df..767941f755 100644 --- a/src/openrct2/windows/main.c +++ b/src/openrct2/windows/main.c @@ -18,7 +18,6 @@ #include "../interface/viewport.h" #include "../interface/widget.h" #include "../interface/window.h" -#include "../rct2.h" #include "../world/footpath.h" rct_widget window_main_widgets[] = { diff --git a/src/openrct2/windows/map.c b/src/openrct2/windows/map.c index 1ed9b7f332..789d0cf240 100644 --- a/src/openrct2/windows/map.c +++ b/src/openrct2/windows/map.c @@ -23,7 +23,7 @@ #include "../interface/widget.h" #include "../interface/window.h" #include "../localisation/localisation.h" -#include "../rct2.h" +#include "../OpenRCT2.h" #include "../sprites.h" #include "../world/entrance.h" #include "../world/footpath.h" diff --git a/src/openrct2/windows/new_ride.c b/src/openrct2/windows/new_ride.c index a15a853133..5874fcf0b7 100644 --- a/src/openrct2/windows/new_ride.c +++ b/src/openrct2/windows/new_ride.c @@ -24,6 +24,7 @@ #include "../management/research.h" #include "../network/network.h" #include "../object.h" +#include "../OpenRCT2.h" #include "../rct1.h" #include "../ride/ride.h" #include "../ride/ride_data.h" diff --git a/src/openrct2/windows/options.c b/src/openrct2/windows/options.c index c938f3b30f..4e2ea54ef1 100644 --- a/src/openrct2/windows/options.c +++ b/src/openrct2/windows/options.c @@ -38,7 +38,6 @@ #include "../localisation/localisation.h" #include "../network/network.h" #include "../platform/platform.h" -#include "../rct2.h" #include "../sprites.h" #include "../title/TitleScreen.h" #include "../title/TitleSequence.h" diff --git a/src/openrct2/windows/park.c b/src/openrct2/windows/park.c index bd1a975217..d637d1be30 100644 --- a/src/openrct2/windows/park.c +++ b/src/openrct2/windows/park.c @@ -27,7 +27,6 @@ #include "../interface/window.h" #include "../management/award.h" #include "../peep/peep.h" -#include "../rct2.h" #include "../ride/ride.h" #include "../scenario/scenario.h" #include "../sprites.h" diff --git a/src/openrct2/windows/ride.c b/src/openrct2/windows/ride.c index a3d2d822d5..e9e30cea40 100644 --- a/src/openrct2/windows/ride.c +++ b/src/openrct2/windows/ride.c @@ -28,9 +28,9 @@ #include "../network/network.h" #include "../object/ObjectManager.h" #include "../object/ObjectRepository.h" +#include "../OpenRCT2.h" #include "../peep/staff.h" #include "../rct1.h" -#include "../rct2.h" #include "../ride/ride.h" #include "../ride/ride_data.h" #include "../ride/RideGroupManager.h" diff --git a/src/openrct2/windows/save_prompt.c b/src/openrct2/windows/save_prompt.c index d8bc0236a7..b052f39a12 100644 --- a/src/openrct2/windows/save_prompt.c +++ b/src/openrct2/windows/save_prompt.c @@ -21,7 +21,6 @@ #include "../interface/widget.h" #include "../interface/window.h" #include "../OpenRCT2.h" -#include "../rct2.h" #include "../sprites.h" enum WINDOW_SAVE_PROMPT_WIDGET_IDX { diff --git a/src/openrct2/windows/scenery.c b/src/openrct2/windows/scenery.c index 1adba70f3d..9d0d0224f2 100644 --- a/src/openrct2/windows/scenery.c +++ b/src/openrct2/windows/scenery.c @@ -24,7 +24,6 @@ #include "../interface/window.h" #include "../localisation/localisation.h" #include "../peep/peep.h" -#include "../rct2.h" #include "../world/map.h" #include "../world/scenery.h" #include "../world/sprite.h" diff --git a/src/openrct2/windows/staff_list.c b/src/openrct2/windows/staff_list.c index d076fd0c97..dd134632bd 100644 --- a/src/openrct2/windows/staff_list.c +++ b/src/openrct2/windows/staff_list.c @@ -24,7 +24,6 @@ #include "../localisation/localisation.h" #include "../peep/peep.h" #include "../peep/staff.h" -#include "../rct2.h" #include "../sprites.h" #include "../util/util.h" #include "../world/footpath.h" diff --git a/src/openrct2/windows/title_command_editor.c b/src/openrct2/windows/title_command_editor.c index a9a393af81..498e2bc08d 100644 --- a/src/openrct2/windows/title_command_editor.c +++ b/src/openrct2/windows/title_command_editor.c @@ -21,7 +21,7 @@ #include "../interface/widget.h" #include "../interface/window.h" #include "../localisation/localisation.h" -#include "../rct2.h" +#include "../OpenRCT2.h" #include "../sprites.h" #include "../title/TitleScreen.h" #include "../title/TitleSequence.h" diff --git a/src/openrct2/windows/title_editor.c b/src/openrct2/windows/title_editor.c index 79b831e4f5..551591e091 100644 --- a/src/openrct2/windows/title_editor.c +++ b/src/openrct2/windows/title_editor.c @@ -23,6 +23,7 @@ #include "../interface/widget.h" #include "../interface/window.h" #include "../localisation/localisation.h" +#include "../OpenRCT2.h" #include "../ParkImporter.h" #include "../peep/peep.h" #include "../peep/staff.h" diff --git a/src/openrct2/windows/title_exit.c b/src/openrct2/windows/title_exit.c index f1f8d61db9..a0470dbe93 100644 --- a/src/openrct2/windows/title_exit.c +++ b/src/openrct2/windows/title_exit.c @@ -22,7 +22,6 @@ #include "../interface/widget.h" #include "../interface/window.h" #include "../intro.h" -#include "../rct2.h" enum WINDOW_TITLE_EXIT_WIDGET_IDX { WIDX_EXIT, diff --git a/src/openrct2/windows/title_options.c b/src/openrct2/windows/title_options.c index eb896bd25c..44dd42db39 100644 --- a/src/openrct2/windows/title_options.c +++ b/src/openrct2/windows/title_options.c @@ -21,7 +21,6 @@ #include "../localisation/localisation.h" #include "../interface/widget.h" #include "../interface/window.h" -#include "../rct2.h" enum WINDOW_TITLE_OPTIONS_WIDGET_IDX { WIDX_OPTIONS, diff --git a/src/openrct2/windows/tooltip.c b/src/openrct2/windows/tooltip.c index fbff3c253d..06231c218e 100644 --- a/src/openrct2/windows/tooltip.c +++ b/src/openrct2/windows/tooltip.c @@ -20,7 +20,6 @@ #include "../input.h" #include "../interface/widget.h" #include "../interface/window.h" -#include "../rct2.h" #include "tooltip.h" enum { diff --git a/src/openrct2/windows/top_toolbar.c b/src/openrct2/windows/top_toolbar.c index e6ef335059..f4f6d9d338 100644 --- a/src/openrct2/windows/top_toolbar.c +++ b/src/openrct2/windows/top_toolbar.c @@ -30,6 +30,7 @@ #include "../localisation/localisation.h" #include "../network/network.h" #include "../network/twitch.h" +#include "../OpenRCT2.h" #include "../ParkImporter.h" #include "../peep/staff.h" #include "../scenario/scenario.h" diff --git a/src/openrct2/windows/track_list.c b/src/openrct2/windows/track_list.c index 324ad6f2c1..68481d1491 100644 --- a/src/openrct2/windows/track_list.c +++ b/src/openrct2/windows/track_list.c @@ -22,6 +22,7 @@ #include "../interface/widget.h" #include "../interface/window.h" #include "../localisation/localisation.h" +#include "../OpenRCT2.h" #include "../rct1.h" #include "../ride/ride.h" #include "../ride/track.h" diff --git a/src/openrct2/windows/track_manage.c b/src/openrct2/windows/track_manage.c index da26d0bdb9..812cf331d8 100644 --- a/src/openrct2/windows/track_manage.c +++ b/src/openrct2/windows/track_manage.c @@ -19,7 +19,6 @@ #include "../interface/widget.h" #include "../interface/window.h" #include "../localisation/localisation.h" -#include "../rct2.h" #include "../ride/track.h" #include "../ride/track_design.h" #include "../ride/TrackDesignRepository.h" diff --git a/src/openrct2/windows/view_clipping.c b/src/openrct2/windows/view_clipping.c index e3a56c2e94..0c9f0cbbe1 100644 --- a/src/openrct2/windows/view_clipping.c +++ b/src/openrct2/windows/view_clipping.c @@ -20,7 +20,6 @@ #include "../interface/viewport.h" #include "../localisation/localisation.h" #include "../paint/paint.h" -#include "../rct2.h" enum WINDOW_VIEW_CLIPPING_WIDGET_IDX { WIDX_BACKGROUND, diff --git a/src/openrct2/windows/water.c b/src/openrct2/windows/water.c index 3469ab310d..9baece4239 100644 --- a/src/openrct2/windows/water.c +++ b/src/openrct2/windows/water.c @@ -20,7 +20,6 @@ #include "../interface/widget.h" #include "../interface/window.h" #include "../localisation/localisation.h" -#include "../rct2.h" #include "../sprites.h" #include "../world/map.h" diff --git a/src/openrct2/world/Climate.cpp b/src/openrct2/world/Climate.cpp index acc4480dbe..e3874f3962 100644 --- a/src/openrct2/world/Climate.cpp +++ b/src/openrct2/world/Climate.cpp @@ -16,6 +16,7 @@ #include "../config/Config.h" #include "../core/Math.hpp" +#include "../OpenRCT2.h" #include "Climate.h" extern "C" @@ -27,7 +28,6 @@ extern "C" #include "../game.h" #include "../interface/window.h" #include "../localisation/date.h" - #include "../rct2.h" #include "../scenario/scenario.h" #include "../sprites.h" #include "../util/util.h" diff --git a/src/openrct2/world/SmallScenery.cpp b/src/openrct2/world/SmallScenery.cpp index 121ce5cab1..6c8a55aca0 100644 --- a/src/openrct2/world/SmallScenery.cpp +++ b/src/openrct2/world/SmallScenery.cpp @@ -15,9 +15,7 @@ #pragma endregion #include "../network/network.h" - -#include "../rct2.h" -#include "../network/network.h" +#include "../OpenRCT2.h" extern "C" { diff --git a/src/openrct2/world/entrance.cpp b/src/openrct2/world/entrance.cpp index b1563c9a28..36c34acd00 100644 --- a/src/openrct2/world/entrance.cpp +++ b/src/openrct2/world/entrance.cpp @@ -14,8 +14,8 @@ *****************************************************************************/ #pragma endregion -#include "../rct2.h" #include "../network/network.h" +#include "../OpenRCT2.h" extern "C" { diff --git a/src/openrct2/world/footpath.c b/src/openrct2/world/footpath.c index c870498b89..59d5168b27 100644 --- a/src/openrct2/world/footpath.c +++ b/src/openrct2/world/footpath.c @@ -19,7 +19,7 @@ #include "../localisation/localisation.h" #include "../network/network.h" #include "../object_list.h" -#include "../rct2.h" +#include "../OpenRCT2.h" #include "../ride/station.h" #include "../ride/track.h" #include "../ride/track_data.h" diff --git a/src/openrct2/world/map.c b/src/openrct2/world/map.c index aad41425cd..b8e53141bb 100644 --- a/src/openrct2/world/map.c +++ b/src/openrct2/world/map.c @@ -27,7 +27,6 @@ #include "../management/finance.h" #include "../network/network.h" #include "../OpenRCT2.h" -#include "../rct2.h" #include "../ride/ride_data.h" #include "../ride/track.h" #include "../ride/track_data.h" diff --git a/src/openrct2/world/park.c b/src/openrct2/world/park.c index 261cee7b1c..eba35b110c 100644 --- a/src/openrct2/world/park.c +++ b/src/openrct2/world/park.c @@ -26,9 +26,9 @@ #include "../management/news_item.h" #include "../management/research.h" #include "../network/network.h" +#include "../OpenRCT2.h" #include "../peep/peep.h" #include "../peep/staff.h" -#include "../rct2.h" #include "../ride/ride.h" #include "../ride/ride_data.h" #include "../scenario/scenario.h" diff --git a/src/openrct2/world/wall.cpp b/src/openrct2/world/wall.cpp index 7889487aa9..a332f96226 100644 --- a/src/openrct2/world/wall.cpp +++ b/src/openrct2/world/wall.cpp @@ -16,6 +16,7 @@ #include "../common.h" #include "../network/network.h" +#include "../OpenRCT2.h" extern "C" {