diff --git a/src/openrct2-ui/ride/Construction.h b/src/openrct2-ui/ride/Construction.h index 9ffdd9cdc7..42d2f347c1 100644 --- a/src/openrct2-ui/ride/Construction.h +++ b/src/openrct2-ui/ride/Construction.h @@ -11,6 +11,7 @@ #include #include +#include namespace OpenRCT2 { diff --git a/src/openrct2/Cheats.cpp b/src/openrct2/Cheats.cpp index c0f94c984e..5a3d0a237d 100644 --- a/src/openrct2/Cheats.cpp +++ b/src/openrct2/Cheats.cpp @@ -16,7 +16,6 @@ #include "network/network.h" #include "ride/Ride.h" #include "scenario/Scenario.h" -#include "util/Util.h" #include "world/Climate.h" #include "world/Footpath.h" #include "world/Map.h" diff --git a/src/openrct2/CommandLineSprite.cpp b/src/openrct2/CommandLineSprite.cpp index 3fb3d96830..9bd58d2566 100644 --- a/src/openrct2/CommandLineSprite.cpp +++ b/src/openrct2/CommandLineSprite.cpp @@ -22,7 +22,6 @@ #include "object/ObjectLimits.h" #include "object/ObjectManager.h" #include "object/ObjectRepository.h" -#include "util/Util.h" #include #include diff --git a/src/openrct2/Context.cpp b/src/openrct2/Context.cpp index 9eff422afe..d19f79c02c 100644 --- a/src/openrct2/Context.cpp +++ b/src/openrct2/Context.cpp @@ -74,7 +74,6 @@ #include "scripting/ScriptEngine.h" #include "ui/UiContext.h" #include "ui/WindowManager.h" -#include "util/Util.h" #include "world/Park.h" #include diff --git a/src/openrct2/actions/BannerSetStyleAction.cpp b/src/openrct2/actions/BannerSetStyleAction.cpp index eaf2c9ca8d..5d23331a76 100644 --- a/src/openrct2/actions/BannerSetStyleAction.cpp +++ b/src/openrct2/actions/BannerSetStyleAction.cpp @@ -12,7 +12,6 @@ #include "../Context.h" #include "../Diagnostic.h" #include "../management/Finance.h" -#include "../util/Util.h" #include "../windows/Intent.h" #include "../world/Banner.h" #include "../world/tile_element/BannerElement.h" diff --git a/src/openrct2/actions/NetworkModifyGroupAction.cpp b/src/openrct2/actions/NetworkModifyGroupAction.cpp index d0ea39590c..b959e440b8 100644 --- a/src/openrct2/actions/NetworkModifyGroupAction.cpp +++ b/src/openrct2/actions/NetworkModifyGroupAction.cpp @@ -10,7 +10,6 @@ #include "NetworkModifyGroupAction.h" #include "../network/network.h" -#include "../util/Util.h" using namespace OpenRCT2; diff --git a/src/openrct2/actions/PeepPickupAction.cpp b/src/openrct2/actions/PeepPickupAction.cpp index f51675278b..b4ca9e897e 100644 --- a/src/openrct2/actions/PeepPickupAction.cpp +++ b/src/openrct2/actions/PeepPickupAction.cpp @@ -14,7 +14,6 @@ #include "../entity/EntityRegistry.h" #include "../entity/Peep.h" #include "../network/network.h" -#include "../util/Util.h" using namespace OpenRCT2; diff --git a/src/openrct2/actions/ScenarioSetSettingAction.cpp b/src/openrct2/actions/ScenarioSetSettingAction.cpp index fccd3b6305..a1dd6f7479 100644 --- a/src/openrct2/actions/ScenarioSetSettingAction.cpp +++ b/src/openrct2/actions/ScenarioSetSettingAction.cpp @@ -16,7 +16,6 @@ #include "../interface/Window.h" #include "../management/Finance.h" #include "../scenario/Scenario.h" -#include "../util/Util.h" #include "../world/Park.h" using namespace OpenRCT2; diff --git a/src/openrct2/actions/TrackRemoveAction.cpp b/src/openrct2/actions/TrackRemoveAction.cpp index d3ec9ef4c9..59e21498bf 100644 --- a/src/openrct2/actions/TrackRemoveAction.cpp +++ b/src/openrct2/actions/TrackRemoveAction.cpp @@ -16,7 +16,6 @@ #include "../ride/Track.h" #include "../ride/TrackData.h" #include "../ride/TrackDesign.h" -#include "../util/Util.h" #include "../world/Footpath.h" #include "../world/MapAnimation.h" #include "../world/tile_element/SurfaceElement.h" diff --git a/src/openrct2/entity/Balloon.cpp b/src/openrct2/entity/Balloon.cpp index 8d55d2047e..27145b92da 100644 --- a/src/openrct2/entity/Balloon.cpp +++ b/src/openrct2/entity/Balloon.cpp @@ -16,7 +16,6 @@ #include "../paint/Paint.h" #include "../profiling/Profiling.h" #include "../scenario/Scenario.h" -#include "../util/Util.h" #include "../world/tile_element/TrackElement.h" #include "EntityRegistry.h" diff --git a/src/openrct2/entity/Peep.h b/src/openrct2/entity/Peep.h index 35a7d84842..517961c5ca 100644 --- a/src/openrct2/entity/Peep.h +++ b/src/openrct2/entity/Peep.h @@ -14,11 +14,11 @@ #include "../localisation/StringIdType.h" #include "../ride/RideTypes.h" #include "../ride/Station.h" -#include "../util/Util.h" #include "../world/Location.hpp" #include #include +#include constexpr uint8_t kPeepMinEnergy = 32; constexpr uint8_t kPeepMaxEnergy = 128; diff --git a/src/openrct2/entity/Staff.h b/src/openrct2/entity/Staff.h index 1831002e8a..4e0cfdea5d 100644 --- a/src/openrct2/entity/Staff.h +++ b/src/openrct2/entity/Staff.h @@ -9,6 +9,7 @@ #pragma once +#include "../util/Util.h" #include "../world/Map.h" #include "Peep.h" diff --git a/src/openrct2/management/NewsItem.cpp b/src/openrct2/management/NewsItem.cpp index 85614b46a4..b0b58ef38b 100644 --- a/src/openrct2/management/NewsItem.cpp +++ b/src/openrct2/management/NewsItem.cpp @@ -26,7 +26,6 @@ #include "../profiling/Profiling.h" #include "../ride/Ride.h" #include "../ride/Vehicle.h" -#include "../util/Util.h" #include "../windows/Intent.h" #include "../world/Location.hpp" diff --git a/src/openrct2/network/NetworkServerAdvertiser.cpp b/src/openrct2/network/NetworkServerAdvertiser.cpp index f6ae41364d..e45bfa333f 100644 --- a/src/openrct2/network/NetworkServerAdvertiser.cpp +++ b/src/openrct2/network/NetworkServerAdvertiser.cpp @@ -23,7 +23,6 @@ # include "../localisation/Localisation.Date.h" # include "../management/Finance.h" # include "../platform/Platform.h" -# include "../util/Util.h" # include "../world/Map.h" # include "../world/Park.h" # include "Socket.h" diff --git a/src/openrct2/object/Object.h b/src/openrct2/object/Object.h index 367fd4701e..ed2005bac9 100644 --- a/src/openrct2/object/Object.h +++ b/src/openrct2/object/Object.h @@ -12,7 +12,6 @@ #include "../core/JsonFwd.hpp" #include "../core/StringTypes.h" #include "../drawing/ImageIndexType.h" -#include "../util/Util.h" #include "ImageTable.h" #include "ObjectAsset.h" #include "ObjectTypes.h" diff --git a/src/openrct2/object/StringTable.cpp b/src/openrct2/object/StringTable.cpp index 13eb669c22..db3c6310d5 100644 --- a/src/openrct2/object/StringTable.cpp +++ b/src/openrct2/object/StringTable.cpp @@ -16,6 +16,7 @@ #include "../core/String.hpp" #include "../localisation/LocalisationService.h" #include "../rct12/CSStringConverter.h" +#include "../util/Util.h" #include "Object.h" using namespace OpenRCT2; diff --git a/src/openrct2/object/TerrainSurfaceObject.h b/src/openrct2/object/TerrainSurfaceObject.h index 9b06c21855..1cfb4b5a87 100644 --- a/src/openrct2/object/TerrainSurfaceObject.h +++ b/src/openrct2/object/TerrainSurfaceObject.h @@ -9,6 +9,7 @@ #pragma once +#include "../core/Money.hpp" #include "Object.h" struct CoordsXY; diff --git a/src/openrct2/peep/GuestPathfinding.cpp b/src/openrct2/peep/GuestPathfinding.cpp index be3b10f1de..77e1652548 100644 --- a/src/openrct2/peep/GuestPathfinding.cpp +++ b/src/openrct2/peep/GuestPathfinding.cpp @@ -19,7 +19,6 @@ #include "../ride/Station.h" #include "../ride/Track.h" #include "../scenario/Scenario.h" -#include "../util/Util.h" #include "../world/Entrance.h" #include "../world/Footpath.h" #include "../world/tile_element/BannerElement.h" diff --git a/src/openrct2/peep/PeepAnimationData.h b/src/openrct2/peep/PeepAnimationData.h index c944a38631..3dadeb678d 100644 --- a/src/openrct2/peep/PeepAnimationData.h +++ b/src/openrct2/peep/PeepAnimationData.h @@ -1,6 +1,7 @@ #pragma once #include "../entity/Peep.h" +#include "../util/Util.h" #include diff --git a/src/openrct2/platform/Crash.cpp b/src/openrct2/platform/Crash.cpp index 6fb17cbdde..b999eeb3de 100644 --- a/src/openrct2/platform/Crash.cpp +++ b/src/openrct2/platform/Crash.cpp @@ -43,7 +43,6 @@ # include "../park/ParkFile.h" # include "../scenario/Scenario.h" # include "../util/SawyerCoding.h" -# include "../util/Util.h" # include "Platform.h" # define WSZ(x) L"" x diff --git a/src/openrct2/platform/Platform.Posix.cpp b/src/openrct2/platform/Platform.Posix.cpp index 40db7f6f0c..f56fc144bd 100644 --- a/src/openrct2/platform/Platform.Posix.cpp +++ b/src/openrct2/platform/Platform.Posix.cpp @@ -16,7 +16,6 @@ # include "../core/Memory.hpp" # include "../core/Path.hpp" # include "../core/String.hpp" -# include "../util/Util.h" # include # include diff --git a/src/openrct2/ride/CableLift.cpp b/src/openrct2/ride/CableLift.cpp index 6dd960b5d3..a91c1c93eb 100644 --- a/src/openrct2/ride/CableLift.cpp +++ b/src/openrct2/ride/CableLift.cpp @@ -12,7 +12,6 @@ #include "../audio/audio.h" #include "../entity/EntityList.h" #include "../rct12/RCT12.h" -#include "../util/Util.h" #include "../world/tile_element/TileElement.h" #include "../world/tile_element/TrackElement.h" #include "Ride.h" diff --git a/src/openrct2/ride/RideConstruction.cpp b/src/openrct2/ride/RideConstruction.cpp index f5f57f7e5f..d310e5c3f1 100644 --- a/src/openrct2/ride/RideConstruction.cpp +++ b/src/openrct2/ride/RideConstruction.cpp @@ -28,7 +28,6 @@ #include "../network/network.h" #include "../ui/UiContext.h" #include "../ui/WindowManager.h" -#include "../util/Util.h" #include "../windows/Intent.h" #include "../world/Banner.h" #include "../world/Climate.h" diff --git a/src/openrct2/ride/ShopItem.h b/src/openrct2/ride/ShopItem.h index 23c706b7b3..3cbcca0b42 100644 --- a/src/openrct2/ride/ShopItem.h +++ b/src/openrct2/ride/ShopItem.h @@ -11,9 +11,9 @@ #include "../core/Money.hpp" #include "../entity/Litter.h" -#include "../util/Util.h" struct Ride; + enum class PeepThoughtType : uint8_t; enum class ShopItem : uint8_t diff --git a/src/openrct2/ride/Track.cpp b/src/openrct2/ride/Track.cpp index b03c3730c3..c432f8ca85 100644 --- a/src/openrct2/ride/Track.cpp +++ b/src/openrct2/ride/Track.cpp @@ -22,7 +22,6 @@ #include "../rct1/RCT1.h" #include "../ride/RideColour.h" #include "../util/SawyerCoding.h" -#include "../util/Util.h" #include "../world/Footpath.h" #include "../world/Map.h" #include "../world/MapAnimation.h" diff --git a/src/openrct2/ride/TrackData.cpp b/src/openrct2/ride/TrackData.cpp index ea93d8643d..8b7db7a82a 100644 --- a/src/openrct2/ride/TrackData.cpp +++ b/src/openrct2/ride/TrackData.cpp @@ -10,6 +10,7 @@ #include "TrackData.h" #include "../localisation/StringIds.h" +#include "../util/Util.h" #include "Track.h" #include "TrackPaint.h" diff --git a/src/openrct2/ride/TrackDesignRepository.cpp b/src/openrct2/ride/TrackDesignRepository.cpp index 20754ae482..8e4d30663a 100644 --- a/src/openrct2/ride/TrackDesignRepository.cpp +++ b/src/openrct2/ride/TrackDesignRepository.cpp @@ -21,7 +21,6 @@ #include "../localisation/LocalisationService.h" #include "../object/ObjectRepository.h" #include "../ride/RideData.h" -#include "../util/Util.h" #include "TrackDesign.h" #include diff --git a/src/openrct2/ride/TrackDesignSave.cpp b/src/openrct2/ride/TrackDesignSave.cpp index e793fc579e..11ea57859a 100644 --- a/src/openrct2/ride/TrackDesignSave.cpp +++ b/src/openrct2/ride/TrackDesignSave.cpp @@ -21,7 +21,6 @@ #include "../object/ObjectManager.h" #include "../rct2/RCT2.h" #include "../util/SawyerCoding.h" -#include "../util/Util.h" #include "../windows/Intent.h" #include "../world/Footpath.h" #include "../world/Scenery.h" diff --git a/src/openrct2/ride/VehicleSubpositionData.h b/src/openrct2/ride/VehicleSubpositionData.h index dd74c5cc24..cfb5f3538c 100644 --- a/src/openrct2/ride/VehicleSubpositionData.h +++ b/src/openrct2/ride/VehicleSubpositionData.h @@ -9,6 +9,7 @@ #pragma once +#include "../util/Util.h" #include "Track.h" #include diff --git a/src/openrct2/world/Climate.h b/src/openrct2/world/Climate.h index 5d7860d249..bf82d4daa8 100644 --- a/src/openrct2/world/Climate.h +++ b/src/openrct2/world/Climate.h @@ -9,7 +9,6 @@ #pragma once -#include "../util/Util.h" #include enum class ClimateType : uint8_t diff --git a/src/openrct2/world/Footpath.cpp b/src/openrct2/world/Footpath.cpp index cff8649020..a3f8a5ea6d 100644 --- a/src/openrct2/world/Footpath.cpp +++ b/src/openrct2/world/Footpath.cpp @@ -32,7 +32,6 @@ #include "../ride/RideData.h" #include "../ride/Track.h" #include "../ride/TrackData.h" -#include "../util/Util.h" #include "Location.hpp" #include "Map.h" #include "MapAnimation.h" diff --git a/src/openrct2/world/MapGen.cpp b/src/openrct2/world/MapGen.cpp index 163fc9d467..aed07fb54d 100644 --- a/src/openrct2/world/MapGen.cpp +++ b/src/openrct2/world/MapGen.cpp @@ -24,7 +24,6 @@ #include "../object/TerrainEdgeObject.h" #include "../object/TerrainSurfaceObject.h" #include "../platform/Platform.h" -#include "../util/Util.h" #include "../world/tile_element/Slope.h" #include "../world/tile_element/SmallSceneryElement.h" #include "../world/tile_element/SurfaceElement.h"