From 764520076fc68832e31d28cecd4aad947decceb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Tue, 13 Mar 2018 13:14:02 +0100 Subject: [PATCH] Reduce header inclusion * Update includes in PlatformEnvironment.cpp * Update includes in ParkImporter.h * Update includes of OpenRCT2.h * Update includes in Intro.h * Remove unused include from Input.cpp * Update includes of Imaging.h * Update includes in Game.h * Update includes in Editor.h * Update includes of Context.cpp * Update includes in Cheats.cpp, CmdlineSprite.cpp * Update includes of some source files * Update includes in some cpp files * Update includes in some cpp files * Update includes in TextureCache.h * Fix tests * Update includes in Font.cpp * Update includes in LightFX files * Update some includes * Fix GCC builds * Update some includes * Update some includes * Update includes in FontsFamilies.* * Update includes of Console.h * Improve includes in Window.h * Improve headers in Viewport.h/Window.h * Fix MSVC build * Fix network-less builds * Reduce inclusion of Map.h --- src/openrct2-ui/WindowManager.cpp | 1 + .../drawing/engines/opengl/TextureCache.h | 1 - src/openrct2-ui/windows/TitleEditor.cpp | 1 + src/openrct2/Cheats.cpp | 5 ----- src/openrct2/CmdlineSprite.cpp | 3 +-- src/openrct2/Context.cpp | 3 +-- src/openrct2/Context.h | 11 +++-------- src/openrct2/Diagnostic.cpp | 1 - src/openrct2/Editor.cpp | 5 +++-- src/openrct2/Editor.h | 6 ------ src/openrct2/Game.h | 7 ++++++- src/openrct2/Imaging.cpp | 1 + src/openrct2/Imaging.h | 8 ++------ src/openrct2/Input.cpp | 3 +-- src/openrct2/Intro.h | 4 +++- src/openrct2/OpenRCT2.h | 2 -- src/openrct2/ParkImporter.h | 2 +- src/openrct2/PlatformEnvironment.cpp | 3 --- src/openrct2/actions/GameAction.cpp | 1 + src/openrct2/audio/Audio.cpp | 1 - src/openrct2/cmdline/CommandLine.cpp | 6 +----- src/openrct2/cmdline/ConvertCommand.cpp | 2 -- src/openrct2/config/Config.cpp | 2 +- src/openrct2/config/IniReader.cpp | 1 - src/openrct2/config/IniReader.hpp | 2 +- src/openrct2/config/IniWriter.hpp | 2 +- src/openrct2/core/File.cpp | 2 +- src/openrct2/drawing/Drawing.h | 1 - src/openrct2/drawing/Font.cpp | 4 ++-- src/openrct2/drawing/LightFX.cpp | 1 - src/openrct2/drawing/LightFX.h | 6 ++++-- src/openrct2/drawing/Rect.cpp | 1 - src/openrct2/drawing/String.cpp | 1 - src/openrct2/drawing/Text.cpp | 1 + src/openrct2/drawing/Text.h | 3 ++- src/openrct2/drawing/X8DrawingEngine.cpp | 2 -- src/openrct2/interface/Chat.h | 3 ++- src/openrct2/interface/Console.cpp | 1 + src/openrct2/interface/Console.h | 3 ++- src/openrct2/interface/FontFamilies.cpp | 1 + src/openrct2/interface/FontFamilies.h | 3 ++- src/openrct2/interface/Viewport.h | 13 ++++++++++--- src/openrct2/interface/Window.h | 5 +---- src/openrct2/interface/Window_internal.h | 2 ++ src/openrct2/localisation/Localisation.cpp | 13 +++++++------ src/openrct2/network/network.h | 2 ++ src/openrct2/paint/Paint.h | 4 +++- src/openrct2/paint/tile_element/Surface.h | 1 - src/openrct2/peep/Peep.cpp | 1 + src/openrct2/peep/Peep.h | 4 +++- src/openrct2/rct1/RCT1.h | 1 - src/openrct2/rct1/S4Importer.cpp | 3 ++- src/openrct2/rct2/RCT2.h | 1 + src/openrct2/rct2/S6Importer.cpp | 1 + src/openrct2/ride/Station.cpp | 2 ++ src/openrct2/ride/Station.h | 3 +-- src/openrct2/ride/Vehicle.h | 2 +- src/openrct2/world/Park.h | 3 ++- src/openrct2/world/Sprite.cpp | 1 + src/openrct2/world/Wall.cpp | 3 +++ test/tests/MultiLaunch.cpp | 1 + test/tests/RideRatings.cpp | 1 + 62 files changed, 92 insertions(+), 92 deletions(-) diff --git a/src/openrct2-ui/WindowManager.cpp b/src/openrct2-ui/WindowManager.cpp index 878fc56c40..32a5b72a93 100644 --- a/src/openrct2-ui/WindowManager.cpp +++ b/src/openrct2-ui/WindowManager.cpp @@ -22,6 +22,7 @@ #include "input/Input.h" #include "input/KeyboardShortcuts.h" #include "WindowManager.h" +#include "windows/Window.h" using namespace OpenRCT2::Ui; diff --git a/src/openrct2-ui/drawing/engines/opengl/TextureCache.h b/src/openrct2-ui/drawing/engines/opengl/TextureCache.h index 245d974da3..56f5a5b490 100644 --- a/src/openrct2-ui/drawing/engines/opengl/TextureCache.h +++ b/src/openrct2-ui/drawing/engines/opengl/TextureCache.h @@ -16,7 +16,6 @@ #pragma once -#include #include #include #include diff --git a/src/openrct2-ui/windows/TitleEditor.cpp b/src/openrct2-ui/windows/TitleEditor.cpp index 7388bc3b2d..7482f2a072 100644 --- a/src/openrct2-ui/windows/TitleEditor.cpp +++ b/src/openrct2-ui/windows/TitleEditor.cpp @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include diff --git a/src/openrct2/Cheats.cpp b/src/openrct2/Cheats.cpp index 639b25060c..f0176639b0 100644 --- a/src/openrct2/Cheats.cpp +++ b/src/openrct2/Cheats.cpp @@ -16,13 +16,8 @@ #include "Cheats.h" #include "config/Config.h" -#include "Editor.h" -#include "Game.h" -#include "interface/Window.h" #include "localisation/Localisation.h" -#include "management/Finance.h" #include "network/network.h" -#include "ride/Station.h" #include "util/Util.h" #include "world/Climate.h" #include "world/Footpath.h" diff --git a/src/openrct2/CmdlineSprite.cpp b/src/openrct2/CmdlineSprite.cpp index 01384f82ef..77c5fab689 100644 --- a/src/openrct2/CmdlineSprite.cpp +++ b/src/openrct2/CmdlineSprite.cpp @@ -20,11 +20,10 @@ #include "CmdlineSprite.h" #include "drawing/Drawing.h" #include "Imaging.h" -#include "localisation/Localisation.h" +#include "localisation/Language.h" #include "OpenRCT2.h" #include "platform/platform.h" #include "util/Util.h" -#include "png.h" #define MODE_DEFAULT 0 #define MODE_CLOSEST 1 diff --git a/src/openrct2/Context.cpp b/src/openrct2/Context.cpp index ec73748e52..969cef6c02 100644 --- a/src/openrct2/Context.cpp +++ b/src/openrct2/Context.cpp @@ -57,6 +57,7 @@ #include "interface/Chat.h" #include "interface/Console.h" #include "interface/themes.h" +#include "interface/Viewport.h" #include "Intro.h" #include "localisation/Date.h" #include "localisation/Language.h" @@ -64,9 +65,7 @@ #include "network/http.h" #include "network/network.h" #include "network/twitch.h" -#include "object/ObjectList.h" #include "platform/platform.h" -#include "rct1/RCT1.h" #include "util/Util.h" using namespace OpenRCT2; diff --git a/src/openrct2/Context.h b/src/openrct2/Context.h index c415b259d6..7854ad3015 100644 --- a/src/openrct2/Context.h +++ b/src/openrct2/Context.h @@ -18,6 +18,9 @@ #include "common.h" +#include + +interface IStream; class Intent; struct rct_window; using rct_windowclass = uint8; @@ -59,12 +62,6 @@ enum CURSOR_PRESSED = CURSOR_DOWN | CURSOR_CHANGED, }; -#ifdef __cplusplus - -#include - -interface IStream; - namespace OpenRCT2 { interface IPlatformEnvironment; @@ -109,8 +106,6 @@ namespace OpenRCT2 IContext * GetContext(); } -#endif // __cplusplus - enum { // The game update inverval in milliseconds, (1000 / 40fps) = 25ms diff --git a/src/openrct2/Diagnostic.cpp b/src/openrct2/Diagnostic.cpp index c07d596b83..c2ebb0b6dd 100644 --- a/src/openrct2/Diagnostic.cpp +++ b/src/openrct2/Diagnostic.cpp @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include #include #include #include "Diagnostic.h" diff --git a/src/openrct2/Editor.cpp b/src/openrct2/Editor.cpp index 05a5d24af1..004c275f8e 100644 --- a/src/openrct2/Editor.cpp +++ b/src/openrct2/Editor.cpp @@ -29,13 +29,14 @@ #include "localisation/Localisation.h" #include "management/NewsItem.h" #include "object/ObjectManager.h" -#include "object/ObjectRepository.h" -#include "object/ObjectList.h" #include "peep/Staff.h" #include "rct1/RCT1.h" #include "util/Util.h" #include "windows/Intent.h" #include "world/Climate.h" +#include "world/Entrance.h" +#include "world/Footpath.h" +#include "world/Scenery.h" #include "interface/Window_internal.h" namespace Editor diff --git a/src/openrct2/Editor.h b/src/openrct2/Editor.h index b572b878ef..dee4af90fc 100644 --- a/src/openrct2/Editor.h +++ b/src/openrct2/Editor.h @@ -18,10 +18,6 @@ #define _EDITOR_H_ #include "common.h" -#include "object/Object.h" - -#ifdef __cplusplus -#include "object/Object.h" namespace Editor { @@ -84,5 +80,3 @@ void editor_open_windows_for_current_step(); void game_command_edit_scenario_options(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp); #endif - -#endif \ No newline at end of file diff --git a/src/openrct2/Game.h b/src/openrct2/Game.h index 0e5a86de14..1824f0b823 100644 --- a/src/openrct2/Game.h +++ b/src/openrct2/Game.h @@ -16,8 +16,13 @@ #pragma once +// TODO: only used by handle_park_load_failure, extract to separate header +#include + #include "common.h" -#include "scenario/Scenario.h" + +struct ParkLoadResult; +struct rct_s6_data; enum GAME_COMMAND { diff --git a/src/openrct2/Imaging.cpp b/src/openrct2/Imaging.cpp index c45f2639ec..88630402e4 100644 --- a/src/openrct2/Imaging.cpp +++ b/src/openrct2/Imaging.cpp @@ -21,6 +21,7 @@ #include "core/FileStream.hpp" #include "core/Guard.hpp" #include "core/Memory.hpp" +#include "drawing/Drawing.h" #include "Imaging.h" diff --git a/src/openrct2/Imaging.h b/src/openrct2/Imaging.h index 142f2ec99c..c6c3df9f5f 100644 --- a/src/openrct2/Imaging.h +++ b/src/openrct2/Imaging.h @@ -18,9 +18,8 @@ #include "common.h" -#include "drawing/Drawing.h" - -#ifdef __cplusplus +struct rct_drawpixelinfo; +struct rct_palette; namespace Imaging { @@ -29,9 +28,6 @@ namespace Imaging bool PngWrite32bpp(sint32 width, sint32 height, const void * pixels, const utf8 * path); } -#endif // __cplusplus - bool image_io_png_read(uint8 * * pixels, uint32 * width, uint32 * height, bool expand, const utf8 * path, sint32 * bitDepth); bool image_io_png_write(const rct_drawpixelinfo * dpi, const rct_palette * palette, const utf8 * path); bool image_io_png_write_32bpp(sint32 width, sint32 height, const void * pixels, const utf8 * path); - diff --git a/src/openrct2/Input.cpp b/src/openrct2/Input.cpp index 6bad6a1f3c..e729d24f7d 100644 --- a/src/openrct2/Input.cpp +++ b/src/openrct2/Input.cpp @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "audio/audio.h" #include "Context.h" #include "Input.h" @@ -85,4 +84,4 @@ void reset_tooltip_not_shown() void input_reset_place_obj_modifier() { gInputPlaceObjectModifier = PLACE_OBJECT_MODIFIER_NONE; -} \ No newline at end of file +} diff --git a/src/openrct2/Intro.h b/src/openrct2/Intro.h index 4e22a7fddf..8c38a1f675 100644 --- a/src/openrct2/Intro.h +++ b/src/openrct2/Intro.h @@ -17,7 +17,9 @@ #ifndef _INTRO_H_ #define _INTRO_H_ -#include "drawing/Drawing.h" +#include "common.h" + +struct rct_drawpixelinfo; enum INTRO_STATE { INTRO_STATE_NONE, diff --git a/src/openrct2/OpenRCT2.h b/src/openrct2/OpenRCT2.h index e437a5b658..989680d12d 100644 --- a/src/openrct2/OpenRCT2.h +++ b/src/openrct2/OpenRCT2.h @@ -17,8 +17,6 @@ #pragma once #include "common.h" -#include "core/Guard.hpp" - #ifndef DISABLE_NETWORK #include diff --git a/src/openrct2/ParkImporter.h b/src/openrct2/ParkImporter.h index d47ada0e7c..096f6847f8 100644 --- a/src/openrct2/ParkImporter.h +++ b/src/openrct2/ParkImporter.h @@ -31,12 +31,12 @@ enum PARK_LOAD_ERROR #include #include -#include "scenario/ScenarioRepository.h" #include "core/String.hpp" interface IObjectManager; interface IObjectRepository; interface IStream; +struct scenario_index_entry; struct ParkLoadResult final { diff --git a/src/openrct2/PlatformEnvironment.cpp b/src/openrct2/PlatformEnvironment.cpp index 060fb00e81..40a56f3364 100644 --- a/src/openrct2/PlatformEnvironment.cpp +++ b/src/openrct2/PlatformEnvironment.cpp @@ -15,15 +15,12 @@ #pragma endregion #include "config/Config.h" -#include "core/Console.hpp" -#include "core/Guard.hpp" #include "core/Path.hpp" #include "core/String.hpp" #include "OpenRCT2.h" #include "platform/platform.h" #include "platform/Platform2.h" #include "PlatformEnvironment.h" -#include "Version.h" using namespace OpenRCT2; diff --git a/src/openrct2/actions/GameAction.cpp b/src/openrct2/actions/GameAction.cpp index 74152f0c82..d9e01d6828 100644 --- a/src/openrct2/actions/GameAction.cpp +++ b/src/openrct2/actions/GameAction.cpp @@ -23,6 +23,7 @@ #include "../localisation/Localisation.h" #include "../network/network.h" #include "../platform/platform.h" +#include "../scenario/Scenario.h" #include "../world/Park.h" #include "GameAction.h" diff --git a/src/openrct2/audio/Audio.cpp b/src/openrct2/audio/Audio.cpp index b2f4c6bc67..8672512a26 100644 --- a/src/openrct2/audio/Audio.cpp +++ b/src/openrct2/audio/Audio.cpp @@ -20,7 +20,6 @@ #include "../core/FileStream.hpp" #include "../core/Memory.hpp" #include "../core/String.hpp" -#include "../core/Util.hpp" #include "../localisation/StringIds.h" #include "../OpenRCT2.h" #include "../ui/UiContext.h" diff --git a/src/openrct2/cmdline/CommandLine.cpp b/src/openrct2/cmdline/CommandLine.cpp index 56b8410c22..2824015540 100644 --- a/src/openrct2/cmdline/CommandLine.cpp +++ b/src/openrct2/cmdline/CommandLine.cpp @@ -14,15 +14,11 @@ *****************************************************************************/ #pragma endregion -#include "../core/Guard.hpp" - -#include "../platform/platform.h" -#include "../OpenRCT2.h" - #include "../core/Console.hpp" #include "../core/Math.hpp" #include "../core/String.hpp" #include "CommandLine.hpp" +#include "../OpenRCT2.h" #pragma region CommandLineArgEnumerator diff --git a/src/openrct2/cmdline/ConvertCommand.cpp b/src/openrct2/cmdline/ConvertCommand.cpp index cd548183ba..f7973eab19 100644 --- a/src/openrct2/cmdline/ConvertCommand.cpp +++ b/src/openrct2/cmdline/ConvertCommand.cpp @@ -17,14 +17,12 @@ #include #include "../common.h" #include "../core/Console.hpp" -#include "../core/Guard.hpp" #include "../core/Path.hpp" #include "../FileClassifier.h" #include "../ParkImporter.h" #include "../rct2/S6Exporter.h" #include "CommandLine.hpp" -#include "../Game.h" #include "../interface/Window.h" #include "../OpenRCT2.h" diff --git a/src/openrct2/config/Config.cpp b/src/openrct2/config/Config.cpp index f6105db2ec..43cb34e2f8 100644 --- a/src/openrct2/config/Config.cpp +++ b/src/openrct2/config/Config.cpp @@ -26,9 +26,9 @@ #include "../interface/Window.h" #include "../network/network.h" #include "../OpenRCT2.h" -#include "../PlatformEnvironment.h" #include "../ui/UiContext.h" #include "Config.h" +#include "ConfigEnum.hpp" #include "IniReader.hpp" #include "IniWriter.hpp" diff --git a/src/openrct2/config/IniReader.cpp b/src/openrct2/config/IniReader.cpp index 5122e454da..1219a54ba1 100644 --- a/src/openrct2/config/IniReader.cpp +++ b/src/openrct2/config/IniReader.cpp @@ -17,7 +17,6 @@ #include #include #include -#include #include #include #include "../common.h" diff --git a/src/openrct2/config/IniReader.hpp b/src/openrct2/config/IniReader.hpp index 9b47c5f557..9a3d856e76 100644 --- a/src/openrct2/config/IniReader.hpp +++ b/src/openrct2/config/IniReader.hpp @@ -18,9 +18,9 @@ #include #include "../common.h" -#include "ConfigEnum.hpp" interface IStream; +template struct IConfigEnum; interface IIniReader { diff --git a/src/openrct2/config/IniWriter.hpp b/src/openrct2/config/IniWriter.hpp index 05f002d2a5..0c7f6b2caa 100644 --- a/src/openrct2/config/IniWriter.hpp +++ b/src/openrct2/config/IniWriter.hpp @@ -18,9 +18,9 @@ #include #include "../common.h" -#include "ConfigEnum.hpp" interface IStream; +template struct IConfigEnum; interface IIniWriter { diff --git a/src/openrct2/core/File.cpp b/src/openrct2/core/File.cpp index 9cd38c2a70..53b8a382a6 100644 --- a/src/openrct2/core/File.cpp +++ b/src/openrct2/core/File.cpp @@ -24,9 +24,9 @@ #include "File.h" #include "FileStream.hpp" #include "String.hpp" +#include "../util/Util.h" #include "../platform/platform.h" -#include "../util/Util.h" namespace File { diff --git a/src/openrct2/drawing/Drawing.h b/src/openrct2/drawing/Drawing.h index 7bfdce1fd1..b240e59843 100644 --- a/src/openrct2/drawing/Drawing.h +++ b/src/openrct2/drawing/Drawing.h @@ -19,7 +19,6 @@ #include "../common.h" #include "../interface/Colour.h" -#include "Font.h" struct rct_g1_element { uint8* offset; // 0x00 diff --git a/src/openrct2/drawing/Font.cpp b/src/openrct2/drawing/Font.cpp index b2ef18a576..45d2507275 100644 --- a/src/openrct2/drawing/Font.cpp +++ b/src/openrct2/drawing/Font.cpp @@ -14,10 +14,10 @@ *****************************************************************************/ #pragma endregion -#include "../core/Guard.hpp" #include "../core/Util.hpp" #include "../localisation/ConversionTables.h" -#include "../localisation/Localisation.h" +#include "../localisation/FormatCodes.h" +#include "../localisation/Language.h" #include "../sprites.h" #include "Drawing.h" #include "Font.h" diff --git a/src/openrct2/drawing/LightFX.cpp b/src/openrct2/drawing/LightFX.cpp index 1e15d25bb3..cce999bf2b 100644 --- a/src/openrct2/drawing/LightFX.cpp +++ b/src/openrct2/drawing/LightFX.cpp @@ -23,7 +23,6 @@ #include "../Game.h" #include "../interface/Viewport.h" #include "../interface/Window.h" -#include "../paint/tile_element/TileElement.h" #include "../util/Util.h" #include "../world/Climate.h" #include "Drawing.h" diff --git a/src/openrct2/drawing/LightFX.h b/src/openrct2/drawing/LightFX.h index 278b9e36ec..8847576cf9 100644 --- a/src/openrct2/drawing/LightFX.h +++ b/src/openrct2/drawing/LightFX.h @@ -20,8 +20,10 @@ #ifdef __ENABLE_LIGHTFX__ #include "../common.h" -#include "../world/Map.h" -#include "Drawing.h" + +struct LocationXY16; +struct rct_drawpixelinfo; +struct rct_palette; enum LIGHTFX_LIGHT_TYPE { LIGHTFX_LIGHT_TYPE_NONE = 0, diff --git a/src/openrct2/drawing/Rect.cpp b/src/openrct2/drawing/Rect.cpp index be351d07dd..d47bac3950 100644 --- a/src/openrct2/drawing/Rect.cpp +++ b/src/openrct2/drawing/Rect.cpp @@ -16,7 +16,6 @@ #include "../common.h" #include "../interface/Colour.h" -#include "../platform/platform.h" #include "Drawing.h" /** diff --git a/src/openrct2/drawing/String.cpp b/src/openrct2/drawing/String.cpp index b50b9c11b8..0a703ea87c 100644 --- a/src/openrct2/drawing/String.cpp +++ b/src/openrct2/drawing/String.cpp @@ -16,7 +16,6 @@ #include #include "../config/Config.h" -#include "../interface/Colour.h" #include "../interface/Viewport.h" #include "../localisation/Localisation.h" #include "../platform/platform.h" diff --git a/src/openrct2/drawing/Text.cpp b/src/openrct2/drawing/Text.cpp index e77a8b5113..3b0c08a586 100644 --- a/src/openrct2/drawing/Text.cpp +++ b/src/openrct2/drawing/Text.cpp @@ -14,6 +14,7 @@ *****************************************************************************/ #pragma endregion +#include "Drawing.h" #include "Text.h" #include "../localisation/Localisation.h" diff --git a/src/openrct2/drawing/Text.h b/src/openrct2/drawing/Text.h index 9ba102471e..863e4abdb1 100644 --- a/src/openrct2/drawing/Text.h +++ b/src/openrct2/drawing/Text.h @@ -17,7 +17,8 @@ #pragma once #include "../common.h" -#include "Drawing.h" + +struct rct_drawpixelinfo; enum class TextAlignment { diff --git a/src/openrct2/drawing/X8DrawingEngine.cpp b/src/openrct2/drawing/X8DrawingEngine.cpp index 3119646831..191177f02b 100644 --- a/src/openrct2/drawing/X8DrawingEngine.cpp +++ b/src/openrct2/drawing/X8DrawingEngine.cpp @@ -18,9 +18,7 @@ #include "../config/Config.h" #include "../Context.h" #include "../ui/UiContext.h" -#include "../core/Guard.hpp" #include "../core/Math.hpp" -#include "../core/Memory.hpp" #include "../interface/Screenshot.h" #include "IDrawingContext.h" #include "IDrawingEngine.h" diff --git a/src/openrct2/interface/Chat.h b/src/openrct2/interface/Chat.h index 7982202447..695b2b06ed 100644 --- a/src/openrct2/interface/Chat.h +++ b/src/openrct2/interface/Chat.h @@ -18,13 +18,14 @@ #define _CHAT_H_ #include "../common.h" -#include "../drawing/Drawing.h" #define CHAT_HISTORY_SIZE 10 #define CHAT_INPUT_SIZE 1024 #define CHAT_MAX_MESSAGE_LENGTH 200 #define CHAT_MAX_WINDOW_WIDTH 600 +struct rct_drawpixelinfo; + enum CHAT_INPUT { CHAT_INPUT_NONE, diff --git a/src/openrct2/interface/Console.cpp b/src/openrct2/interface/Console.cpp index afbf43f3c5..118e72e4ff 100644 --- a/src/openrct2/interface/Console.cpp +++ b/src/openrct2/interface/Console.cpp @@ -21,6 +21,7 @@ #include "../config/Config.h" #include "../Context.h" +#include "../core/Guard.hpp" #include "../core/Math.hpp" #include "../core/String.hpp" #include "../core/Util.hpp" diff --git a/src/openrct2/interface/Console.h b/src/openrct2/interface/Console.h index 166f1487b8..d72fa3ff4a 100644 --- a/src/openrct2/interface/Console.h +++ b/src/openrct2/interface/Console.h @@ -18,9 +18,10 @@ #define _CONSOLE_H_ #include "../common.h" -#include "../drawing/Drawing.h" #include "../localisation/FormatCodes.h" +struct rct_drawpixelinfo; + enum CONSOLE_INPUT { CONSOLE_INPUT_NONE, diff --git a/src/openrct2/interface/FontFamilies.cpp b/src/openrct2/interface/FontFamilies.cpp index 80aea3c52e..6cd0d22455 100644 --- a/src/openrct2/interface/FontFamilies.cpp +++ b/src/openrct2/interface/FontFamilies.cpp @@ -14,6 +14,7 @@ *****************************************************************************/ #pragma endregion +#include "Fonts.h" #include "FontFamilies.h" #ifndef NO_TTF diff --git a/src/openrct2/interface/FontFamilies.h b/src/openrct2/interface/FontFamilies.h index e766c85f8c..7b86fc2e08 100644 --- a/src/openrct2/interface/FontFamilies.h +++ b/src/openrct2/interface/FontFamilies.h @@ -22,7 +22,8 @@ #ifndef NO_TTF #include -#include "Fonts.h" + +struct TTFFontSetDescriptor; using TTFontFamily = std::vector; diff --git a/src/openrct2/interface/Viewport.h b/src/openrct2/interface/Viewport.h index a1c4e59360..4c3985ce28 100644 --- a/src/openrct2/interface/Viewport.h +++ b/src/openrct2/interface/Viewport.h @@ -17,11 +17,18 @@ #ifndef _VIEWPORT_H_ #define _VIEWPORT_H_ -#include "../world/Map.h" -#include "../world/Sprite.h" -#include "../paint/Paint.h" #include "Window.h" +struct paint_session; +struct paint_struct; +struct rct_drawpixelinfo; +struct rct_peep; +struct rct_tile_element; +struct rct_vehicle; +struct rct_window; +union paint_entry; +union rct_sprite; + enum { VIEWPORT_FLAG_UNDERGROUND_INSIDE = (1 << 0), VIEWPORT_FLAG_SEETHROUGH_RIDES = (1 << 1), diff --git a/src/openrct2/interface/Window.h b/src/openrct2/interface/Window.h index eab0a7bcd0..c2478a20bb 100644 --- a/src/openrct2/interface/Window.h +++ b/src/openrct2/interface/Window.h @@ -18,14 +18,11 @@ #define _WINDOW_H_ #include "../common.h" -#include "../drawing/Drawing.h" -#include "../management/Research.h" -#include "../peep/Peep.h" #include "../ride/Ride.h" #include "../ride/TrackDesign.h" -#include "../ride/Vehicle.h" #include "../scenario/Scenario.h" #include "../world/Park.h" +#include "../paint/Paint.h" #include "Colour.h" struct rct_window; diff --git a/src/openrct2/interface/Window_internal.h b/src/openrct2/interface/Window_internal.h index aa090c3d77..e602351eef 100644 --- a/src/openrct2/interface/Window_internal.h +++ b/src/openrct2/interface/Window_internal.h @@ -17,6 +17,8 @@ #ifndef _WINDOW2_H_ #define _WINDOW2_H_ +struct rct_research_item; + /** * Window structure * size: 0x4C0 diff --git a/src/openrct2/localisation/Localisation.cpp b/src/openrct2/localisation/Localisation.cpp index 00940fa57b..b1b32f91d1 100644 --- a/src/openrct2/localisation/Localisation.cpp +++ b/src/openrct2/localisation/Localisation.cpp @@ -30,13 +30,14 @@ #include "../common.h" #include "../config/Config.h" -#include "../core/Util.hpp" -#include "../management/Marketing.h" -#include "../Game.h" -#include "../util/Util.h" -#include "Date.h" -#include "Localisation.h" #include "../core/Math.hpp" +#include "../core/Util.hpp" +#include "Date.h" +#include "../Game.h" +#include "Localisation.h" +#include "../management/Marketing.h" +#include "../ride/Ride.h" +#include "../util/Util.h" char gCommonStringFormatBuffer[256]; uint8 gCommonFormatArgs[80]; diff --git a/src/openrct2/network/network.h b/src/openrct2/network/network.h index 159b0d3877..3be7cb1a88 100644 --- a/src/openrct2/network/network.h +++ b/src/openrct2/network/network.h @@ -44,6 +44,8 @@ enum { #include "NetworkTypes.h" struct GameAction; +struct rct_peep; +struct LocationXYZ16; #ifndef DISABLE_NETWORK diff --git a/src/openrct2/paint/Paint.h b/src/openrct2/paint/Paint.h index ad90eb6cd5..a2ad8bda69 100644 --- a/src/openrct2/paint/Paint.h +++ b/src/openrct2/paint/Paint.h @@ -17,9 +17,11 @@ #pragma once #include "../common.h" -#include "../world/Map.h" #include "../interface/Colour.h" #include "../drawing/Drawing.h" +#include "../world/Location.hpp" + +struct rct_tile_element; #pragma pack(push, 1) /* size 0x12 */ diff --git a/src/openrct2/paint/tile_element/Surface.h b/src/openrct2/paint/tile_element/Surface.h index 7f9b56e9a3..9f27c09116 100644 --- a/src/openrct2/paint/tile_element/Surface.h +++ b/src/openrct2/paint/tile_element/Surface.h @@ -19,7 +19,6 @@ #include "../../common.h" #include "../../sprites.h" -#include "../../world/Map.h" enum { diff --git a/src/openrct2/peep/Peep.cpp b/src/openrct2/peep/Peep.cpp index e49635841b..9b5a9bb617 100644 --- a/src/openrct2/peep/Peep.cpp +++ b/src/openrct2/peep/Peep.cpp @@ -22,6 +22,7 @@ #include "../audio/audio.h" #include "../Cheats.h" #include "../config/Config.h" +#include "../core/Guard.hpp" #include "../core/Math.hpp" #include "../core/Util.hpp" #include "../Game.h" diff --git a/src/openrct2/peep/Peep.h b/src/openrct2/peep/Peep.h index 1b0880bcdb..f4222ac3c8 100644 --- a/src/openrct2/peep/Peep.h +++ b/src/openrct2/peep/Peep.h @@ -19,7 +19,7 @@ #include "../common.h" #include "../rct12/RCT12.h" -#include "../world/Map.h" +#include "../world/Location.hpp" #define PEEP_MAX_THOUGHTS 5 #define PEEP_THOUGHT_ITEM_NONE 255 @@ -38,6 +38,8 @@ #define PEEP_MAX_ENERGY 128 #define PEEP_MAX_ENERGY_TARGET 255 // Oddly, this differs from max energy! +struct rct_tile_element; + enum PEEP_TYPE { PEEP_TYPE_GUEST, diff --git a/src/openrct2/rct1/RCT1.h b/src/openrct2/rct1/RCT1.h index 403dd2ca97..c55bfbeff3 100644 --- a/src/openrct2/rct1/RCT1.h +++ b/src/openrct2/rct1/RCT1.h @@ -23,7 +23,6 @@ #include "../rct12/RCT12.h" #include "../ride/Ride.h" #include "../world/Banner.h" -#include "../world/Map.h" #include "../world/Sprite.h" #include "../world/MapAnimation.h" diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index c9482f4a04..b411d9300d 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -32,6 +32,7 @@ #include "../ParkImporter.h" #include "../ride/Station.h" #include "../scenario/ScenarioSources.h" +#include "../scenario/ScenarioRepository.h" #include "Tables.h" #include "../object/ObjectList.h" @@ -2904,4 +2905,4 @@ static sint32 GetWallType(rct_tile_element * tileElement, sint32 edge) static uint8 GetWallColour(rct_tile_element * tileElement) { return ((tileElement->type & 0xC0) >> 3) | ((tileElement->properties.wall.type & 0xE0) >> 5); -} \ No newline at end of file +} diff --git a/src/openrct2/rct2/RCT2.h b/src/openrct2/rct2/RCT2.h index 44cee4a1e8..575ba35196 100644 --- a/src/openrct2/rct2/RCT2.h +++ b/src/openrct2/rct2/RCT2.h @@ -21,6 +21,7 @@ #include "../ride/Vehicle.h" #include "../common.h" #include "../rct12/RCT12.h" +#include "../world/Location.hpp" #define RCT2_MAX_STAFF 200 #define RCT2_MAX_BANNERS_IN_PARK 250 diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index 04a21e7590..dd47204178 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -44,6 +44,7 @@ #include "../ride/Ride.h" #include "../ride/RideRatings.h" #include "../scenario/Scenario.h" +#include "../scenario/ScenarioRepository.h" #include "../util/SawyerCoding.h" #include "../world/Climate.h" #include "../world/Entrance.h" diff --git a/src/openrct2/ride/Station.cpp b/src/openrct2/ride/Station.cpp index b23a874499..757bb64032 100644 --- a/src/openrct2/ride/Station.cpp +++ b/src/openrct2/ride/Station.cpp @@ -17,6 +17,8 @@ #include "../Game.h" #include "Station.h" #include "Track.h" +#include "../scenario/Scenario.h" +#include "../world/Sprite.h" static void ride_update_station_blocksection(Ride * ride, sint32 stationIndex); static void ride_update_station_bumpercar(Ride * ride, sint32 stationIndex); diff --git a/src/openrct2/ride/Station.h b/src/openrct2/ride/Station.h index 6a6240300c..4605116843 100644 --- a/src/openrct2/ride/Station.h +++ b/src/openrct2/ride/Station.h @@ -17,7 +17,6 @@ #pragma once #include "../common.h" -#include "../world/Map.h" #include "Ride.h" void ride_update_station(Ride * ride, sint32 stationIndex); @@ -34,4 +33,4 @@ void ride_clear_entrance_location(Ride * ride, const sint32 stationIndex); void ride_clear_exit_location(Ride * ride, const sint32 stationIndex); void ride_set_entrance_location(Ride * ride, const sint32 stationIndex, const TileCoordsXYZD location); -void ride_set_exit_location(Ride * ride, const sint32 stationIndex, const TileCoordsXYZD location); \ No newline at end of file +void ride_set_exit_location(Ride * ride, const sint32 stationIndex, const TileCoordsXYZD location); diff --git a/src/openrct2/ride/Vehicle.h b/src/openrct2/ride/Vehicle.h index c9f928f197..828c173376 100644 --- a/src/openrct2/ride/Vehicle.h +++ b/src/openrct2/ride/Vehicle.h @@ -18,7 +18,7 @@ #define _VEHICLE_H_ #include "../common.h" -#include "../world/Map.h" +#include "../world/Location.hpp" struct rct_vehicle_colour { uint8 body_colour; diff --git a/src/openrct2/world/Park.h b/src/openrct2/world/Park.h index 43261d6026..5b992ecf64 100644 --- a/src/openrct2/world/Park.h +++ b/src/openrct2/world/Park.h @@ -18,13 +18,14 @@ #define _PARK_H_ #include "../common.h" -#include "Map.h" #define DECRYPT_MONEY(money) ((money32)rol32((money) ^ 0xF4EC9621, 13)) #define ENCRYPT_MONEY(money) ((money32)(ror32((money), 13) ^ 0xF4EC9621)) #define MAX_ENTRANCE_FEE MONEY(200,00) +struct rct_peep; + enum { PARK_FLAGS_PARK_OPEN = (1 << 0), PARK_FLAGS_SCENARIO_COMPLETE_NAME_INPUT = (1 << 1), diff --git a/src/openrct2/world/Sprite.cpp b/src/openrct2/world/Sprite.cpp index 40a620172a..ff33687cd7 100644 --- a/src/openrct2/world/Sprite.cpp +++ b/src/openrct2/world/Sprite.cpp @@ -17,6 +17,7 @@ #include #include "../audio/audio.h" #include "../Cheats.h" +#include "../core/Guard.hpp" #include "../core/Math.hpp" #include "../Game.h" #include "../interface/Viewport.h" diff --git a/src/openrct2/world/Wall.cpp b/src/openrct2/world/Wall.cpp index 084193f4ec..73255989a9 100644 --- a/src/openrct2/world/Wall.cpp +++ b/src/openrct2/world/Wall.cpp @@ -21,10 +21,13 @@ #include "../Cheats.h" #include "../Game.h" #include "../localisation/StringIds.h" +#include "../management/Finance.h" #include "../ride/Track.h" #include "../ride/TrackData.h" +#include "Banner.h" #include "LargeScenery.h" #include "Map.h" +#include "MapAnimation.h" #include "Park.h" #include "Scenery.h" #include "SmallScenery.h" diff --git a/test/tests/MultiLaunch.cpp b/test/tests/MultiLaunch.cpp index af359c7a17..03b665bcfe 100644 --- a/test/tests/MultiLaunch.cpp +++ b/test/tests/MultiLaunch.cpp @@ -7,6 +7,7 @@ #include #include #include +#include #include "TestData.h" #include diff --git a/test/tests/RideRatings.cpp b/test/tests/RideRatings.cpp index 27654ea86f..0f09062449 100644 --- a/test/tests/RideRatings.cpp +++ b/test/tests/RideRatings.cpp @@ -6,6 +6,7 @@ #include #include #include +#include #include "TestData.h" #include