From e2da19f0f7dff1efd930f1ca54df433820f53597 Mon Sep 17 00:00:00 2001 From: Hielke Morsink Date: Fri, 29 Jul 2022 18:45:10 +0200 Subject: [PATCH] Add missing includes --- src/openrct2-ui/Ui.cpp | 1 + src/openrct2-ui/audio/AudioMixer.h | 1 + .../drawing/engines/HardwareDisplayDrawingEngine.cpp | 1 + src/openrct2-ui/input/ShortcutManager.h | 1 + src/openrct2-ui/scripting/CustomImages.h | 2 ++ src/openrct2-ui/scripting/CustomWindow.h | 1 + src/openrct2-ui/scripting/ScTitleSequence.hpp | 1 + src/openrct2-ui/windows/InstallTrack.cpp | 1 + src/openrct2-ui/windows/Ride.cpp | 1 + src/openrct2/Intro.cpp | 2 ++ src/openrct2/audio/Audio.cpp | 1 + src/openrct2/audio/audio.h | 1 + src/openrct2/drawing/X8DrawingEngine.h | 2 ++ src/openrct2/entity/Peep.cpp | 3 +++ src/openrct2/network/NetworkBase.h | 1 + src/openrct2/object/ObjectFactory.cpp | 1 + src/openrct2/object/ObjectManager.h | 1 + src/openrct2/peep/GuestPathfinding.h | 2 ++ src/openrct2/platform/Platform.Android.cpp | 1 + src/openrct2/ride/Ride.h | 1 + src/openrct2/ride/TrackDesign.h | 2 ++ src/openrct2/scenario/ScenarioRepository.cpp | 1 + src/openrct2/scripting/ScriptEngine.cpp | 2 ++ src/openrct2/scripting/bindings/entity/ScStaff.hpp | 2 ++ src/openrct2/scripting/bindings/network/ScNetwork.hpp | 2 ++ src/openrct2/scripting/bindings/network/ScSocket.hpp | 1 + src/openrct2/scripting/bindings/object/ScObject.hpp | 1 + src/openrct2/scripting/bindings/ride/ScTrackIterator.h | 1 + src/openrct2/scripting/bindings/world/ScTile.hpp | 1 + src/openrct2/ui/WindowManager.h | 1 + src/openrct2/world/Climate.cpp | 5 +++-- test/tests/FormattingTests.cpp | 1 + test/tests/Pathfinding.cpp | 3 +++ test/tests/PlayTests.cpp | 1 + test/tests/TileElements.cpp | 1 + test/tests/TileElementsView.cpp | 1 + 36 files changed, 50 insertions(+), 2 deletions(-) diff --git a/src/openrct2-ui/Ui.cpp b/src/openrct2-ui/Ui.cpp index 1de7da484b..ec46d5e2e5 100644 --- a/src/openrct2-ui/Ui.cpp +++ b/src/openrct2-ui/Ui.cpp @@ -14,6 +14,7 @@ #include "audio/AudioContext.h" #include "drawing/BitmapReader.h" +#include #include #include #include diff --git a/src/openrct2-ui/audio/AudioMixer.h b/src/openrct2-ui/audio/AudioMixer.h index 286a77ee64..990d616c23 100644 --- a/src/openrct2-ui/audio/AudioMixer.h +++ b/src/openrct2-ui/audio/AudioMixer.h @@ -16,6 +16,7 @@ #include #include #include +#include #include #include #include diff --git a/src/openrct2-ui/drawing/engines/HardwareDisplayDrawingEngine.cpp b/src/openrct2-ui/drawing/engines/HardwareDisplayDrawingEngine.cpp index 2dc99a7f99..b7914d1c05 100644 --- a/src/openrct2-ui/drawing/engines/HardwareDisplayDrawingEngine.cpp +++ b/src/openrct2-ui/drawing/engines/HardwareDisplayDrawingEngine.cpp @@ -11,6 +11,7 @@ #include #include +#include #include #include #include diff --git a/src/openrct2-ui/input/ShortcutManager.h b/src/openrct2-ui/input/ShortcutManager.h index 88e87fdd7a..2b7e12f3f4 100644 --- a/src/openrct2-ui/input/ShortcutManager.h +++ b/src/openrct2-ui/input/ShortcutManager.h @@ -13,6 +13,7 @@ #include #include +#include #include #include #include diff --git a/src/openrct2-ui/scripting/CustomImages.h b/src/openrct2-ui/scripting/CustomImages.h index 930586b8cc..1c731d7f12 100644 --- a/src/openrct2-ui/scripting/CustomImages.h +++ b/src/openrct2-ui/scripting/CustomImages.h @@ -11,9 +11,11 @@ #ifdef ENABLE_SCRIPTING +# include # include # include # include +# include # include namespace OpenRCT2::Scripting diff --git a/src/openrct2-ui/scripting/CustomWindow.h b/src/openrct2-ui/scripting/CustomWindow.h index 15dc17d56d..9548813d77 100644 --- a/src/openrct2-ui/scripting/CustomWindow.h +++ b/src/openrct2-ui/scripting/CustomWindow.h @@ -13,6 +13,7 @@ # include "../interface/Window.h" +# include # include # include diff --git a/src/openrct2-ui/scripting/ScTitleSequence.hpp b/src/openrct2-ui/scripting/ScTitleSequence.hpp index 04aa9a83fa..e9aa521c38 100644 --- a/src/openrct2-ui/scripting/ScTitleSequence.hpp +++ b/src/openrct2-ui/scripting/ScTitleSequence.hpp @@ -11,6 +11,7 @@ #ifdef ENABLE_SCRIPTING +# include # include # include # include diff --git a/src/openrct2-ui/windows/InstallTrack.cpp b/src/openrct2-ui/windows/InstallTrack.cpp index eeae4b09be..c894d81ba9 100644 --- a/src/openrct2-ui/windows/InstallTrack.cpp +++ b/src/openrct2-ui/windows/InstallTrack.cpp @@ -8,6 +8,7 @@ *****************************************************************************/ #include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index ebfd83e0d5..b714090f5a 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include diff --git a/src/openrct2/Intro.cpp b/src/openrct2/Intro.cpp index fafbfff5ff..352df487a5 100644 --- a/src/openrct2/Intro.cpp +++ b/src/openrct2/Intro.cpp @@ -16,6 +16,8 @@ #include "drawing/Drawing.h" #include "sprites.h" +#include + using namespace OpenRCT2::Audio; #define BACKROUND_COLOUR_DARK PALETTE_INDEX_10 diff --git a/src/openrct2/audio/Audio.cpp b/src/openrct2/audio/Audio.cpp index 03b473ac3f..e739f5cc6a 100644 --- a/src/openrct2/audio/Audio.cpp +++ b/src/openrct2/audio/Audio.cpp @@ -34,6 +34,7 @@ #include #include +#include #include namespace OpenRCT2::Audio diff --git a/src/openrct2/audio/audio.h b/src/openrct2/audio/audio.h index 96c460c44f..302e51b98a 100644 --- a/src/openrct2/audio/audio.h +++ b/src/openrct2/audio/audio.h @@ -14,6 +14,7 @@ #include "../ride/RideTypes.h" #include "AudioMixer.h" +#include #include class AudioObject; diff --git a/src/openrct2/drawing/X8DrawingEngine.h b/src/openrct2/drawing/X8DrawingEngine.h index 8a6671f032..e4787e94c3 100644 --- a/src/openrct2/drawing/X8DrawingEngine.h +++ b/src/openrct2/drawing/X8DrawingEngine.h @@ -13,6 +13,8 @@ #include "IDrawingContext.h" #include "IDrawingEngine.h" +#include + namespace OpenRCT2 { namespace Ui diff --git a/src/openrct2/entity/Peep.cpp b/src/openrct2/entity/Peep.cpp index 4a93cc0528..4e58e6f4da 100644 --- a/src/openrct2/entity/Peep.cpp +++ b/src/openrct2/entity/Peep.cpp @@ -59,6 +59,9 @@ #include #include #include +#include +#include +#include using namespace OpenRCT2::Audio; diff --git a/src/openrct2/network/NetworkBase.h b/src/openrct2/network/NetworkBase.h index 1a4bebefb2..55db7ff0fc 100644 --- a/src/openrct2/network/NetworkBase.h +++ b/src/openrct2/network/NetworkBase.h @@ -11,6 +11,7 @@ #include "NetworkUser.h" #include +#include #ifndef DISABLE_NETWORK diff --git a/src/openrct2/object/ObjectFactory.cpp b/src/openrct2/object/ObjectFactory.cpp index a1049915d4..76f21d88bf 100644 --- a/src/openrct2/object/ObjectFactory.cpp +++ b/src/openrct2/object/ObjectFactory.cpp @@ -42,6 +42,7 @@ #include "WaterObject.h" #include +#include #include struct IFileDataRetriever diff --git a/src/openrct2/object/ObjectManager.h b/src/openrct2/object/ObjectManager.h index decdf52f88..cc31e2c11a 100644 --- a/src/openrct2/object/ObjectManager.h +++ b/src/openrct2/object/ObjectManager.h @@ -12,6 +12,7 @@ #include "../common.h" #include "../object/Object.h" +#include #include struct IObjectRepository; diff --git a/src/openrct2/peep/GuestPathfinding.h b/src/openrct2/peep/GuestPathfinding.h index 0731305f80..abe32d3392 100644 --- a/src/openrct2/peep/GuestPathfinding.h +++ b/src/openrct2/peep/GuestPathfinding.h @@ -13,6 +13,8 @@ #include "../ride/RideTypes.h" #include "../world/Location.hpp" +#include + struct Peep; struct Guest; struct TileElement; diff --git a/src/openrct2/platform/Platform.Android.cpp b/src/openrct2/platform/Platform.Android.cpp index 4342ec07b8..697c57f05c 100644 --- a/src/openrct2/platform/Platform.Android.cpp +++ b/src/openrct2/platform/Platform.Android.cpp @@ -16,6 +16,7 @@ # include # include +# include AndroidClassLoader::~AndroidClassLoader() { diff --git a/src/openrct2/ride/Ride.h b/src/openrct2/ride/Ride.h index 68e7a296d1..44e02027cb 100644 --- a/src/openrct2/ride/Ride.h +++ b/src/openrct2/ride/Ride.h @@ -23,6 +23,7 @@ #include #include +#include #include struct IObjectManager; diff --git a/src/openrct2/ride/TrackDesign.h b/src/openrct2/ride/TrackDesign.h index be4967501a..2f7f4bf350 100644 --- a/src/openrct2/ride/TrackDesign.h +++ b/src/openrct2/ride/TrackDesign.h @@ -16,6 +16,8 @@ #include "../rct2/RCT2.h" #include "../world/Map.h" +#include + struct Ride; #define TRACK_PREVIEW_IMAGE_SIZE (370 * 217) diff --git a/src/openrct2/scenario/ScenarioRepository.cpp b/src/openrct2/scenario/ScenarioRepository.cpp index 628a250d6f..640a32cb44 100644 --- a/src/openrct2/scenario/ScenarioRepository.cpp +++ b/src/openrct2/scenario/ScenarioRepository.cpp @@ -33,6 +33,7 @@ #include #include +#include #include using namespace OpenRCT2; diff --git a/src/openrct2/scripting/ScriptEngine.cpp b/src/openrct2/scripting/ScriptEngine.cpp index 87d1110c99..2e4cdea0bc 100644 --- a/src/openrct2/scripting/ScriptEngine.cpp +++ b/src/openrct2/scripting/ScriptEngine.cpp @@ -52,7 +52,9 @@ # include "bindings/world/ScTileElement.hpp" # include +# include # include +# include using namespace OpenRCT2; using namespace OpenRCT2::Scripting; diff --git a/src/openrct2/scripting/bindings/entity/ScStaff.hpp b/src/openrct2/scripting/bindings/entity/ScStaff.hpp index f86e373572..251a8013fd 100644 --- a/src/openrct2/scripting/bindings/entity/ScStaff.hpp +++ b/src/openrct2/scripting/bindings/entity/ScStaff.hpp @@ -13,6 +13,8 @@ # include "ScPeep.hpp" +# include + namespace OpenRCT2::Scripting { class ScPatrolArea diff --git a/src/openrct2/scripting/bindings/network/ScNetwork.hpp b/src/openrct2/scripting/bindings/network/ScNetwork.hpp index e659b110d5..c24ef466ff 100644 --- a/src/openrct2/scripting/bindings/network/ScNetwork.hpp +++ b/src/openrct2/scripting/bindings/network/ScNetwork.hpp @@ -16,6 +16,8 @@ # include "ScPlayerGroup.hpp" # include "ScSocket.hpp" +# include + namespace OpenRCT2::Scripting { class ScNetwork diff --git a/src/openrct2/scripting/bindings/network/ScSocket.hpp b/src/openrct2/scripting/bindings/network/ScSocket.hpp index add92f5ac1..df840f7c32 100644 --- a/src/openrct2/scripting/bindings/network/ScSocket.hpp +++ b/src/openrct2/scripting/bindings/network/ScSocket.hpp @@ -19,6 +19,7 @@ # include "../../ScriptEngine.h" # include +# include # include namespace OpenRCT2::Scripting diff --git a/src/openrct2/scripting/bindings/object/ScObject.hpp b/src/openrct2/scripting/bindings/object/ScObject.hpp index 49b60e486d..ddd6bc8544 100644 --- a/src/openrct2/scripting/bindings/object/ScObject.hpp +++ b/src/openrct2/scripting/bindings/object/ScObject.hpp @@ -19,6 +19,7 @@ # include "../../Duktape.hpp" # include "../../ScriptEngine.h" +# include # include namespace OpenRCT2::Scripting diff --git a/src/openrct2/scripting/bindings/ride/ScTrackIterator.h b/src/openrct2/scripting/bindings/ride/ScTrackIterator.h index 9613947814..1d7cc78368 100644 --- a/src/openrct2/scripting/bindings/ride/ScTrackIterator.h +++ b/src/openrct2/scripting/bindings/ride/ScTrackIterator.h @@ -16,6 +16,7 @@ # include "../../Duktape.hpp" # include +# include namespace OpenRCT2::Scripting { diff --git a/src/openrct2/scripting/bindings/world/ScTile.hpp b/src/openrct2/scripting/bindings/world/ScTile.hpp index 1698377c42..378f8aedda 100644 --- a/src/openrct2/scripting/bindings/world/ScTile.hpp +++ b/src/openrct2/scripting/bindings/world/ScTile.hpp @@ -17,6 +17,7 @@ # include # include +# include # include # include diff --git a/src/openrct2/ui/WindowManager.h b/src/openrct2/ui/WindowManager.h index 76cf9bba62..00d296df66 100644 --- a/src/openrct2/ui/WindowManager.h +++ b/src/openrct2/ui/WindowManager.h @@ -13,6 +13,7 @@ #include "../interface/Window.h" #include "../windows/Intent.h" +#include #include #include diff --git a/src/openrct2/world/Climate.cpp b/src/openrct2/world/Climate.cpp index 6df1660599..84fee0345c 100644 --- a/src/openrct2/world/Climate.cpp +++ b/src/openrct2/world/Climate.cpp @@ -26,10 +26,11 @@ #include "../util/Util.h" #include "../windows/Intent.h" -using namespace OpenRCT2::Audio; - #include #include +#include + +using namespace OpenRCT2::Audio; constexpr int32_t MAX_THUNDER_INSTANCES = 2; diff --git a/test/tests/FormattingTests.cpp b/test/tests/FormattingTests.cpp index 96ad20d82e..55bc313536 100644 --- a/test/tests/FormattingTests.cpp +++ b/test/tests/FormattingTests.cpp @@ -10,6 +10,7 @@ #include "openrct2/localisation/Formatting.h" #include +#include #include #include #include diff --git a/test/tests/Pathfinding.cpp b/test/tests/Pathfinding.cpp index cac06cb984..f9e7f6609c 100644 --- a/test/tests/Pathfinding.cpp +++ b/test/tests/Pathfinding.cpp @@ -6,6 +6,7 @@ #include "openrct2/scenario/Scenario.h" #include +#include #include #include #include @@ -13,6 +14,8 @@ #include #include #include +#include +#include using namespace OpenRCT2; diff --git a/test/tests/PlayTests.cpp b/test/tests/PlayTests.cpp index 297227756b..b7c61e21a6 100644 --- a/test/tests/PlayTests.cpp +++ b/test/tests/PlayTests.cpp @@ -10,6 +10,7 @@ #include "TestData.h" #include +#include #include #include #include diff --git a/test/tests/TileElements.cpp b/test/tests/TileElements.cpp index 5136c1542f..6dbf703f1e 100644 --- a/test/tests/TileElements.cpp +++ b/test/tests/TileElements.cpp @@ -10,6 +10,7 @@ #include "TestData.h" #include +#include #include #include #include diff --git a/test/tests/TileElementsView.cpp b/test/tests/TileElementsView.cpp index b1aae0b7db..9226c762d5 100644 --- a/test/tests/TileElementsView.cpp +++ b/test/tests/TileElementsView.cpp @@ -10,6 +10,7 @@ #include "TestData.h" #include +#include #include #include #include