diff --git a/src/openrct2-ui/interface/ViewportInteraction.cpp b/src/openrct2-ui/interface/ViewportInteraction.cpp index 19523c86fb..24b644e0eb 100644 --- a/src/openrct2-ui/interface/ViewportInteraction.cpp +++ b/src/openrct2-ui/interface/ViewportInteraction.cpp @@ -27,8 +27,8 @@ #include #include #include +#include #include -#include #include #include #include diff --git a/src/openrct2-ui/windows/EditorScenarioOptions.cpp b/src/openrct2-ui/windows/EditorScenarioOptions.cpp index b5536faa7c..00affbfbc2 100644 --- a/src/openrct2-ui/windows/EditorScenarioOptions.cpp +++ b/src/openrct2-ui/windows/EditorScenarioOptions.cpp @@ -20,10 +20,10 @@ #include #include #include +#include #include #include #include -#include #include #include #include diff --git a/src/openrct2-ui/windows/GameBottomToolbar.cpp b/src/openrct2-ui/windows/GameBottomToolbar.cpp index 203239e0ae..5f428a2b9c 100644 --- a/src/openrct2-ui/windows/GameBottomToolbar.cpp +++ b/src/openrct2-ui/windows/GameBottomToolbar.cpp @@ -18,12 +18,12 @@ #include #include #include +#include +#include #include #include #include #include -#include -#include #include #include #include diff --git a/src/openrct2-ui/windows/Guest.cpp b/src/openrct2-ui/windows/Guest.cpp index fb80e7f6b1..7478bfffc2 100644 --- a/src/openrct2-ui/windows/Guest.cpp +++ b/src/openrct2-ui/windows/Guest.cpp @@ -18,11 +18,11 @@ #include #include #include +#include +#include #include #include #include -#include -#include #include #include #include diff --git a/src/openrct2-ui/windows/GuestList.cpp b/src/openrct2-ui/windows/GuestList.cpp index 89f5ada129..6725b248e6 100644 --- a/src/openrct2-ui/windows/GuestList.cpp +++ b/src/openrct2-ui/windows/GuestList.cpp @@ -16,8 +16,8 @@ #include #include #include +#include #include -#include #include #include #include diff --git a/src/openrct2-ui/windows/Map.cpp b/src/openrct2-ui/windows/Map.cpp index 740b3f6981..de16f59073 100644 --- a/src/openrct2-ui/windows/Map.cpp +++ b/src/openrct2-ui/windows/Map.cpp @@ -26,8 +26,8 @@ #include #include #include +#include #include -#include #include #include #include diff --git a/src/openrct2-ui/windows/News.cpp b/src/openrct2-ui/windows/News.cpp index 1d5c693134..782031ca3a 100644 --- a/src/openrct2-ui/windows/News.cpp +++ b/src/openrct2-ui/windows/News.cpp @@ -14,10 +14,10 @@ #include #include #include +#include +#include #include #include -#include -#include #include static constexpr const rct_string_id WINDOW_TITLE = STR_RECENT_MESSAGES; diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index e0a1fd800e..00ce4e15e2 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -41,7 +42,6 @@ #include #include #include -#include #include #include #include diff --git a/src/openrct2-ui/windows/Staff.cpp b/src/openrct2-ui/windows/Staff.cpp index 1d444cf94f..8b5af37dac 100644 --- a/src/openrct2-ui/windows/Staff.cpp +++ b/src/openrct2-ui/windows/Staff.cpp @@ -22,10 +22,10 @@ #include #include #include +#include #include #include #include -#include #include #include #include diff --git a/src/openrct2-ui/windows/StaffFirePrompt.cpp b/src/openrct2-ui/windows/StaffFirePrompt.cpp index adc82384d5..e43d6882df 100644 --- a/src/openrct2-ui/windows/StaffFirePrompt.cpp +++ b/src/openrct2-ui/windows/StaffFirePrompt.cpp @@ -13,9 +13,9 @@ #include #include #include +#include #include #include -#include static constexpr const rct_string_id WINDOW_TITLE = STR_SACK_STAFF; static constexpr const int32_t WW = 200; diff --git a/src/openrct2-ui/windows/StaffList.cpp b/src/openrct2-ui/windows/StaffList.cpp index c5653398fd..1706923187 100644 --- a/src/openrct2-ui/windows/StaffList.cpp +++ b/src/openrct2-ui/windows/StaffList.cpp @@ -21,9 +21,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/src/openrct2-ui/windows/TitleCommandEditor.cpp b/src/openrct2-ui/windows/TitleCommandEditor.cpp index 2e55b5e6c2..b52ab1f1fc 100644 --- a/src/openrct2-ui/windows/TitleCommandEditor.cpp +++ b/src/openrct2-ui/windows/TitleCommandEditor.cpp @@ -22,8 +22,8 @@ #include #include #include +#include #include -#include #include #include #include diff --git a/src/openrct2-ui/windows/TopToolbar.cpp b/src/openrct2-ui/windows/TopToolbar.cpp index 2a1aec1f0f..08d2369e4d 100644 --- a/src/openrct2-ui/windows/TopToolbar.cpp +++ b/src/openrct2-ui/windows/TopToolbar.cpp @@ -48,12 +48,12 @@ #include #include #include +#include #include #include #include #include #include -#include #include #include #include diff --git a/src/openrct2/Editor.cpp b/src/openrct2/Editor.cpp index c76173755a..71ac481da9 100644 --- a/src/openrct2/Editor.cpp +++ b/src/openrct2/Editor.cpp @@ -21,6 +21,8 @@ #include "audio/audio.h" #include "entity/EntityList.h" #include "entity/EntityRegistry.h" +#include "entity/Guest.h" +#include "entity/Staff.h" #include "interface/Viewport.h" #include "interface/Window_internal.h" #include "localisation/Localisation.h" @@ -29,8 +31,6 @@ #include "object/DefaultObjects.h" #include "object/ObjectManager.h" #include "object/ObjectRepository.h" -#include "peep/Guest.h" -#include "peep/Staff.h" #include "rct1/RCT1.h" #include "scenario/Scenario.h" #include "ui/UiContext.h" diff --git a/src/openrct2/Game.cpp b/src/openrct2/Game.cpp index 1a9d16fb67..6aec3d9873 100644 --- a/src/openrct2/Game.cpp +++ b/src/openrct2/Game.cpp @@ -26,6 +26,8 @@ #include "core/FileScanner.h" #include "core/Path.hpp" #include "entity/EntityRegistry.h" +#include "entity/Peep.h" +#include "entity/Staff.h" #include "interface/Colour.h" #include "interface/Screenshot.h" #include "interface/Viewport.h" @@ -37,8 +39,6 @@ #include "network/network.h" #include "object/Object.h" #include "object/ObjectList.h" -#include "peep/Peep.h" -#include "peep/Staff.h" #include "platform/Platform2.h" #include "rct1/RCT1.h" #include "ride/Ride.h" diff --git a/src/openrct2/GameState.cpp b/src/openrct2/GameState.cpp index ce56d00782..d841a345a5 100644 --- a/src/openrct2/GameState.cpp +++ b/src/openrct2/GameState.cpp @@ -20,12 +20,12 @@ #include "actions/GameAction.h" #include "config/Config.h" #include "entity/EntityRegistry.h" +#include "entity/Staff.h" #include "interface/Screenshot.h" #include "localisation/Date.h" #include "localisation/Localisation.h" #include "management/NewsItem.h" #include "network/network.h" -#include "peep/Staff.h" #include "platform/Platform2.h" #include "ride/Vehicle.h" #include "scenario/Scenario.h" diff --git a/src/openrct2/GameStateSnapshots.cpp b/src/openrct2/GameStateSnapshots.cpp index bf3cf80d2f..8a93b07aa9 100644 --- a/src/openrct2/GameStateSnapshots.cpp +++ b/src/openrct2/GameStateSnapshots.cpp @@ -15,11 +15,11 @@ #include "entity/EntityList.h" #include "entity/EntityRegistry.h" #include "entity/Fountain.h" +#include "entity/Guest.h" #include "entity/Litter.h" #include "entity/MoneyEffect.h" #include "entity/Particle.h" -#include "peep/Guest.h" -#include "peep/Staff.h" +#include "entity/Staff.h" #include "ride/Vehicle.h" static constexpr size_t MaximumGameStateSnapshots = 32; diff --git a/src/openrct2/ParkFile.cpp b/src/openrct2/ParkFile.cpp index 656b20987a..2154af5ffa 100644 --- a/src/openrct2/ParkFile.cpp +++ b/src/openrct2/ParkFile.cpp @@ -31,6 +31,7 @@ #include "entity/Litter.h" #include "entity/MoneyEffect.h" #include "entity/Particle.h" +#include "entity/Staff.h" #include "interface/Viewport.h" #include "interface/Window.h" #include "localisation/Date.h" @@ -42,7 +43,6 @@ #include "object/ObjectManager.h" #include "object/ObjectRepository.h" #include "peep/RideUseSystem.h" -#include "peep/Staff.h" #include "ride/ShopItem.h" #include "ride/Vehicle.h" #include "scenario/Scenario.h" diff --git a/src/openrct2/actions/GameActionCompat.cpp b/src/openrct2/actions/GameActionCompat.cpp index a778adfa02..5b29dc8842 100644 --- a/src/openrct2/actions/GameActionCompat.cpp +++ b/src/openrct2/actions/GameActionCompat.cpp @@ -7,7 +7,7 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "../peep/Staff.h" +#include "../entity/Staff.h" #include "../ride/Track.h" #include "../world/Entrance.h" #include "../world/Park.h" diff --git a/src/openrct2/actions/PeepPickupAction.cpp b/src/openrct2/actions/PeepPickupAction.cpp index 7adff15e12..8d1549cabd 100644 --- a/src/openrct2/actions/PeepPickupAction.cpp +++ b/src/openrct2/actions/PeepPickupAction.cpp @@ -11,8 +11,8 @@ #include "../Input.h" #include "../entity/Entity.h" +#include "../entity/Peep.h" #include "../network/network.h" -#include "../peep/Peep.h" #include "../util/Util.h" PeepPickupAction::PeepPickupAction(PeepPickupType type, uint32_t spriteId, const CoordsXYZ& loc, NetworkPlayerId_t owner) diff --git a/src/openrct2/actions/ScenarioSetSettingAction.cpp b/src/openrct2/actions/ScenarioSetSettingAction.cpp index e136356dc2..3cebbe2fed 100644 --- a/src/openrct2/actions/ScenarioSetSettingAction.cpp +++ b/src/openrct2/actions/ScenarioSetSettingAction.cpp @@ -10,9 +10,9 @@ #include "ScenarioSetSettingAction.h" #include "../OpenRCT2.h" +#include "../entity/Peep.h" #include "../interface/Window.h" #include "../management/Finance.h" -#include "../peep/Peep.h" #include "../scenario/Scenario.h" #include "../util/Util.h" #include "../world/Park.h" diff --git a/src/openrct2/actions/SetCheatAction.cpp b/src/openrct2/actions/SetCheatAction.cpp index 57524b3637..13516ee6d3 100644 --- a/src/openrct2/actions/SetCheatAction.cpp +++ b/src/openrct2/actions/SetCheatAction.cpp @@ -17,10 +17,10 @@ #include "../drawing/Drawing.h" #include "../entity/Duck.h" #include "../entity/EntityRegistry.h" +#include "../entity/Staff.h" #include "../localisation/Localisation.h" #include "../localisation/StringIds.h" #include "../network/network.h" -#include "../peep/Staff.h" #include "../ride/Ride.h" #include "../ride/Vehicle.h" #include "../scenario/Scenario.h" diff --git a/src/openrct2/actions/StaffFireAction.cpp b/src/openrct2/actions/StaffFireAction.cpp index 7cba7ebf98..c3f14155fe 100644 --- a/src/openrct2/actions/StaffFireAction.cpp +++ b/src/openrct2/actions/StaffFireAction.cpp @@ -10,8 +10,8 @@ #include "StaffFireAction.h" #include "../entity/Entity.h" +#include "../entity/Staff.h" #include "../interface/Window.h" -#include "../peep/Staff.h" StaffFireAction::StaffFireAction(uint16_t spriteId) : _spriteId(spriteId) diff --git a/src/openrct2/actions/StaffHireNewAction.cpp b/src/openrct2/actions/StaffHireNewAction.cpp index d9f8227e31..51f33f051f 100644 --- a/src/openrct2/actions/StaffHireNewAction.cpp +++ b/src/openrct2/actions/StaffHireNewAction.cpp @@ -14,11 +14,11 @@ #include "../core/MemoryStream.h" #include "../drawing/Drawing.h" #include "../entity/EntityRegistry.h" +#include "../entity/Staff.h" #include "../interface/Window.h" #include "../localisation/Localisation.h" #include "../localisation/StringIds.h" #include "../management/Finance.h" -#include "../peep/Staff.h" #include "../ride/Ride.h" #include "../scenario/Scenario.h" #include "../ui/UiContext.h" diff --git a/src/openrct2/actions/StaffHireNewAction.h b/src/openrct2/actions/StaffHireNewAction.h index 8fadf47f8f..6a78407c39 100644 --- a/src/openrct2/actions/StaffHireNewAction.h +++ b/src/openrct2/actions/StaffHireNewAction.h @@ -9,7 +9,7 @@ #pragma once -#include "../peep/Staff.h" +#include "../entity/Staff.h" #include "GameAction.h" struct StaffHireNewActionResult diff --git a/src/openrct2/actions/StaffSetColourAction.cpp b/src/openrct2/actions/StaffSetColourAction.cpp index a7d18eade3..20ace14b49 100644 --- a/src/openrct2/actions/StaffSetColourAction.cpp +++ b/src/openrct2/actions/StaffSetColourAction.cpp @@ -13,8 +13,8 @@ #include "../core/MemoryStream.h" #include "../drawing/Drawing.h" #include "../entity/EntityList.h" +#include "../entity/Staff.h" #include "../localisation/StringIds.h" -#include "../peep/Staff.h" #include "../ui/UiContext.h" #include "../ui/WindowManager.h" #include "../windows/Intent.h" diff --git a/src/openrct2/actions/StaffSetCostumeAction.h b/src/openrct2/actions/StaffSetCostumeAction.h index 061f6457dd..f9f47c8cc2 100644 --- a/src/openrct2/actions/StaffSetCostumeAction.h +++ b/src/openrct2/actions/StaffSetCostumeAction.h @@ -9,7 +9,7 @@ #pragma once -#include "../peep/Staff.h" +#include "../entity/Staff.h" #include "GameAction.h" class StaffSetCostumeAction final : public GameActionBase diff --git a/src/openrct2/actions/StaffSetNameAction.cpp b/src/openrct2/actions/StaffSetNameAction.cpp index 7e53045d91..d86e8a9689 100644 --- a/src/openrct2/actions/StaffSetNameAction.cpp +++ b/src/openrct2/actions/StaffSetNameAction.cpp @@ -14,10 +14,10 @@ #include "../core/MemoryStream.h" #include "../drawing/Drawing.h" #include "../entity/Entity.h" +#include "../entity/Staff.h" #include "../interface/Window.h" #include "../localisation/Localisation.h" #include "../localisation/StringIds.h" -#include "../peep/Staff.h" #include "../windows/Intent.h" #include "../world/Park.h" diff --git a/src/openrct2/actions/StaffSetOrdersAction.cpp b/src/openrct2/actions/StaffSetOrdersAction.cpp index 9e770710fb..1e73b6755c 100644 --- a/src/openrct2/actions/StaffSetOrdersAction.cpp +++ b/src/openrct2/actions/StaffSetOrdersAction.cpp @@ -11,10 +11,10 @@ #include "../Context.h" #include "../entity/Entity.h" +#include "../entity/Staff.h" #include "../interface/Window.h" #include "../localisation/Localisation.h" #include "../localisation/StringIds.h" -#include "../peep/Staff.h" #include "../windows/Intent.h" StaffSetOrdersAction::StaffSetOrdersAction(uint16_t spriteIndex, uint8_t ordersId) diff --git a/src/openrct2/actions/StaffSetPatrolAreaAction.cpp b/src/openrct2/actions/StaffSetPatrolAreaAction.cpp index 6da783405d..303b07c2ec 100644 --- a/src/openrct2/actions/StaffSetPatrolAreaAction.cpp +++ b/src/openrct2/actions/StaffSetPatrolAreaAction.cpp @@ -10,9 +10,9 @@ #include "StaffSetPatrolAreaAction.h" #include "../entity/Entity.h" +#include "../entity/Peep.h" +#include "../entity/Staff.h" #include "../interface/Window.h" -#include "../peep/Peep.h" -#include "../peep/Staff.h" StaffSetPatrolAreaAction::StaffSetPatrolAreaAction(uint16_t spriteId, const CoordsXY& loc, const StaffSetPatrolAreaMode mode) : _spriteId(spriteId) diff --git a/src/openrct2/audio/Audio.cpp b/src/openrct2/audio/Audio.cpp index 6fb3c4f673..b3e0a30ed2 100644 --- a/src/openrct2/audio/Audio.cpp +++ b/src/openrct2/audio/Audio.cpp @@ -17,10 +17,10 @@ #include "../core/FileStream.h" #include "../core/Memory.hpp" #include "../core/String.hpp" +#include "../entity/Peep.h" #include "../interface/Viewport.h" #include "../localisation/Language.h" #include "../localisation/StringIds.h" -#include "../peep/Peep.h" #include "../ride/Ride.h" #include "../ride/RideAudio.h" #include "../ui/UiContext.h" diff --git a/src/openrct2/core/DataSerialiserTraits.h b/src/openrct2/core/DataSerialiserTraits.h index 63100d5a9d..8ef60287ba 100644 --- a/src/openrct2/core/DataSerialiserTraits.h +++ b/src/openrct2/core/DataSerialiserTraits.h @@ -11,11 +11,11 @@ #include "../Cheats.h" #include "../core/MemoryStream.h" +#include "../entity/Guest.h" #include "../localisation/Localisation.h" #include "../network/NetworkTypes.h" #include "../network/network.h" #include "../object/Object.h" -#include "../peep/Guest.h" #include "../ride/RideColour.h" #include "../ride/TrackDesign.h" #include "../world/Location.hpp" diff --git a/src/openrct2/entity/Entity.cpp b/src/openrct2/entity/Entity.cpp index 36b314bd85..d7fd18883a 100644 --- a/src/openrct2/entity/Entity.cpp +++ b/src/openrct2/entity/Entity.cpp @@ -10,8 +10,8 @@ #include "Entity.h" #include "../core/DataSerialiser.h" -#include "../peep/Peep.h" -#include "../peep/Staff.h" +#include "../entity/Peep.h" +#include "../entity/Staff.h" #include "../ride/Vehicle.h" #include "Balloon.h" #include "Duck.h" diff --git a/src/openrct2/entity/EntityRegistry.cpp b/src/openrct2/entity/EntityRegistry.cpp index a1f48a6c17..f20f1a0919 100644 --- a/src/openrct2/entity/EntityRegistry.cpp +++ b/src/openrct2/entity/EntityRegistry.cpp @@ -15,10 +15,10 @@ #include "../core/DataSerialiser.h" #include "../core/Guard.hpp" #include "../core/MemoryStream.h" +#include "../entity/Peep.h" +#include "../entity/Staff.h" #include "../interface/Viewport.h" -#include "../peep/Peep.h" #include "../peep/RideUseSystem.h" -#include "../peep/Staff.h" #include "../ride/Vehicle.h" #include "../scenario/Scenario.h" #include "Balloon.h" diff --git a/src/openrct2/entity/EntityTweener.cpp b/src/openrct2/entity/EntityTweener.cpp index ccb350b5e1..3674556c30 100644 --- a/src/openrct2/entity/EntityTweener.cpp +++ b/src/openrct2/entity/EntityTweener.cpp @@ -8,8 +8,8 @@ *****************************************************************************/ #include "EntityTweener.h" -#include "../peep/Guest.h" -#include "../peep/Staff.h" +#include "../entity/Guest.h" +#include "../entity/Staff.h" #include "../ride/Vehicle.h" #include "EntityList.h" #include "EntityRegistry.h" diff --git a/src/openrct2/peep/Guest.cpp b/src/openrct2/entity/Guest.cpp similarity index 99% rename from src/openrct2/peep/Guest.cpp rename to src/openrct2/entity/Guest.cpp index e263a19ac6..b80c4ab27e 100644 --- a/src/openrct2/peep/Guest.cpp +++ b/src/openrct2/entity/Guest.cpp @@ -27,6 +27,8 @@ #include "../management/Marketing.h" #include "../management/NewsItem.h" #include "../network/network.h" +#include "../peep/GuestPathfinding.h" +#include "../peep/RideUseSystem.h" #include "../rct2/RCT2.h" #include "../ride/Ride.h" #include "../ride/RideData.h" @@ -47,9 +49,7 @@ #include "../world/Scenery.h" #include "../world/Surface.h" #include "../world/TileElementsView.h" -#include "GuestPathfinding.h" #include "Peep.h" -#include "RideUseSystem.h" #include "Staff.h" #include diff --git a/src/openrct2/peep/Guest.h b/src/openrct2/entity/Guest.h similarity index 100% rename from src/openrct2/peep/Guest.h rename to src/openrct2/entity/Guest.h diff --git a/src/openrct2/peep/Peep.cpp b/src/openrct2/entity/Peep.cpp similarity index 99% rename from src/openrct2/peep/Peep.cpp rename to src/openrct2/entity/Peep.cpp index e10cb1eec1..287c10fb7f 100644 --- a/src/openrct2/peep/Peep.cpp +++ b/src/openrct2/entity/Peep.cpp @@ -28,6 +28,7 @@ #include "../management/Marketing.h" #include "../management/NewsItem.h" #include "../network/network.h" +#include "../peep/GuestPathfinding.h" #include "../ride/Ride.h" #include "../ride/RideData.h" #include "../ride/ShopItem.h" @@ -47,7 +48,6 @@ #include "../world/Scenery.h" #include "../world/SmallScenery.h" #include "../world/Surface.h" -#include "GuestPathfinding.h" #include "Staff.h" #include diff --git a/src/openrct2/peep/Peep.h b/src/openrct2/entity/Peep.h similarity index 100% rename from src/openrct2/peep/Peep.h rename to src/openrct2/entity/Peep.h diff --git a/src/openrct2/peep/Staff.cpp b/src/openrct2/entity/Staff.cpp similarity index 99% rename from src/openrct2/peep/Staff.cpp rename to src/openrct2/entity/Staff.cpp index f781cb199c..bc87fb4699 100644 --- a/src/openrct2/peep/Staff.cpp +++ b/src/openrct2/entity/Staff.cpp @@ -28,6 +28,7 @@ #include "../object/ObjectManager.h" #include "../object/TerrainSurfaceObject.h" #include "../paint/tile_element/Paint.TileElement.h" +#include "../peep/GuestPathfinding.h" #include "../ride/RideData.h" #include "../ride/Station.h" #include "../ride/Track.h" @@ -40,7 +41,6 @@ #include "../world/Scenery.h" #include "../world/SmallScenery.h" #include "../world/Surface.h" -#include "GuestPathfinding.h" #include "Peep.h" #include diff --git a/src/openrct2/peep/Staff.h b/src/openrct2/entity/Staff.h similarity index 100% rename from src/openrct2/peep/Staff.h rename to src/openrct2/entity/Staff.h diff --git a/src/openrct2/interface/InteractiveConsole.cpp b/src/openrct2/interface/InteractiveConsole.cpp index 9156864e20..114dffc10f 100644 --- a/src/openrct2/interface/InteractiveConsole.cpp +++ b/src/openrct2/interface/InteractiveConsole.cpp @@ -30,6 +30,7 @@ #include "../drawing/Font.h" #include "../entity/EntityList.h" #include "../entity/EntityRegistry.h" +#include "../entity/Staff.h" #include "../interface/Chat.h" #include "../interface/Colour.h" #include "../interface/Window_internal.h" @@ -42,7 +43,6 @@ #include "../object/ObjectList.h" #include "../object/ObjectManager.h" #include "../object/ObjectRepository.h" -#include "../peep/Staff.h" #include "../platform/platform.h" #include "../ride/Ride.h" #include "../ride/RideData.h" diff --git a/src/openrct2/interface/Viewport.cpp b/src/openrct2/interface/Viewport.cpp index f32ac3b20b..ca0ffcb8de 100644 --- a/src/openrct2/interface/Viewport.cpp +++ b/src/openrct2/interface/Viewport.cpp @@ -19,9 +19,9 @@ #include "../drawing/Drawing.h" #include "../drawing/IDrawingEngine.h" #include "../entity/EntityList.h" +#include "../entity/Guest.h" +#include "../entity/Staff.h" #include "../paint/Paint.h" -#include "../peep/Guest.h" -#include "../peep/Staff.h" #include "../ride/Ride.h" #include "../ride/TrackDesign.h" #include "../ride/Vehicle.h" diff --git a/src/openrct2/libopenrct2.vcxproj b/src/openrct2/libopenrct2.vcxproj index b344c76c9d..3d126ab9ab 100644 --- a/src/openrct2/libopenrct2.vcxproj +++ b/src/openrct2/libopenrct2.vcxproj @@ -213,9 +213,12 @@ + + + @@ -303,11 +306,8 @@ - - - @@ -670,9 +670,12 @@ + + + @@ -768,12 +771,9 @@ - - - diff --git a/src/openrct2/management/Award.cpp b/src/openrct2/management/Award.cpp index 5eff6a8847..7ec413e53f 100644 --- a/src/openrct2/management/Award.cpp +++ b/src/openrct2/management/Award.cpp @@ -10,10 +10,10 @@ #include "Award.h" #include "../config/Config.h" +#include "../entity/Guest.h" #include "../interface/Window.h" #include "../localisation/Localisation.h" #include "../localisation/StringIds.h" -#include "../peep/Guest.h" #include "../ride/Ride.h" #include "../ride/RideData.h" #include "../scenario/Scenario.h" diff --git a/src/openrct2/management/Finance.cpp b/src/openrct2/management/Finance.cpp index dc78081c5d..6f23a84040 100644 --- a/src/openrct2/management/Finance.cpp +++ b/src/openrct2/management/Finance.cpp @@ -12,11 +12,11 @@ #include "../Context.h" #include "../Game.h" #include "../OpenRCT2.h" +#include "../entity/Peep.h" +#include "../entity/Staff.h" #include "../interface/Window.h" #include "../localisation/Date.h" #include "../localisation/Localisation.h" -#include "../peep/Peep.h" -#include "../peep/Staff.h" #include "../ride/Ride.h" #include "../scenario/Scenario.h" #include "../util/Util.h" diff --git a/src/openrct2/management/Marketing.cpp b/src/openrct2/management/Marketing.cpp index c55b856c00..9888d8abd4 100644 --- a/src/openrct2/management/Marketing.cpp +++ b/src/openrct2/management/Marketing.cpp @@ -12,9 +12,9 @@ #include "../Cheats.h" #include "../Game.h" #include "../config/Config.h" +#include "../entity/Guest.h" #include "../interface/Window.h" #include "../localisation/Localisation.h" -#include "../peep/Guest.h" #include "../ride/Ride.h" #include "../ride/RideData.h" #include "../ride/ShopItem.h" diff --git a/src/openrct2/management/NewsItem.cpp b/src/openrct2/management/NewsItem.cpp index 774a46cb55..89caf98505 100644 --- a/src/openrct2/management/NewsItem.cpp +++ b/src/openrct2/management/NewsItem.cpp @@ -14,12 +14,12 @@ #include "../OpenRCT2.h" #include "../audio/audio.h" #include "../entity/Entity.h" +#include "../entity/Peep.h" #include "../interface/Window.h" #include "../interface/Window_internal.h" #include "../localisation/Date.h" #include "../localisation/Localisation.h" #include "../management/Research.h" -#include "../peep/Peep.h" #include "../ride/Ride.h" #include "../ride/Vehicle.h" #include "../util/Util.h" diff --git a/src/openrct2/network/NetworkServerAdvertiser.cpp b/src/openrct2/network/NetworkServerAdvertiser.cpp index 238f921138..4c6777e5de 100644 --- a/src/openrct2/network/NetworkServerAdvertiser.cpp +++ b/src/openrct2/network/NetworkServerAdvertiser.cpp @@ -17,9 +17,9 @@ # include "../core/Http.h" # include "../core/Json.hpp" # include "../core/String.hpp" +# include "../entity/Guest.h" # include "../localisation/Date.h" # include "../management/Finance.h" -# include "../peep/Guest.h" # include "../platform/Platform2.h" # include "../platform/platform.h" # include "../util/Util.h" diff --git a/src/openrct2/object/SceneryGroupObject.cpp b/src/openrct2/object/SceneryGroupObject.cpp index 7c026dfcdc..c5ebee8ed0 100644 --- a/src/openrct2/object/SceneryGroupObject.cpp +++ b/src/openrct2/object/SceneryGroupObject.cpp @@ -17,8 +17,8 @@ #include "../core/Memory.hpp" #include "../core/String.hpp" #include "../drawing/Drawing.h" +#include "../entity/Staff.h" #include "../localisation/Language.h" -#include "../peep/Staff.h" #include "ObjectManager.h" #include "ObjectRepository.h" diff --git a/src/openrct2/paint/sprite/Paint.Peep.cpp b/src/openrct2/paint/sprite/Paint.Peep.cpp index 6ea786032e..262bc4c667 100644 --- a/src/openrct2/paint/sprite/Paint.Peep.cpp +++ b/src/openrct2/paint/sprite/Paint.Peep.cpp @@ -9,8 +9,8 @@ #include "../../config/Config.h" #include "../../drawing/LightFX.h" +#include "../../entity/Guest.h" #include "../../interface/Viewport.h" -#include "../../peep/Guest.h" #include "../Paint.h" #include "Paint.Sprite.h" diff --git a/src/openrct2/paint/sprite/Paint.Sprite.cpp b/src/openrct2/paint/sprite/Paint.Sprite.cpp index dcceb7bfb4..219061b4e0 100644 --- a/src/openrct2/paint/sprite/Paint.Sprite.cpp +++ b/src/openrct2/paint/sprite/Paint.Sprite.cpp @@ -18,8 +18,8 @@ #include "../../entity/Litter.h" #include "../../entity/MoneyEffect.h" #include "../../entity/Particle.h" +#include "../../entity/Staff.h" #include "../../interface/Viewport.h" -#include "../../peep/Staff.h" #include "../../ride/RideData.h" #include "../../ride/TrackDesign.h" #include "../../ride/VehiclePaint.h" diff --git a/src/openrct2/paint/tile_element/Paint.Path.cpp b/src/openrct2/paint/tile_element/Paint.Path.cpp index 64533f83eb..4244ef9ded 100644 --- a/src/openrct2/paint/tile_element/Paint.Path.cpp +++ b/src/openrct2/paint/tile_element/Paint.Path.cpp @@ -13,6 +13,8 @@ #include "../../core/Numerics.hpp" #include "../../drawing/LightFX.h" #include "../../entity/Entity.h" +#include "../../entity/Peep.h" +#include "../../entity/Staff.h" #include "../../interface/Viewport.h" #include "../../localisation/Localisation.h" #include "../../object/FootpathObject.h" @@ -20,8 +22,6 @@ #include "../../object/FootpathSurfaceObject.h" #include "../../object/ObjectList.h" #include "../../object/ObjectManager.h" -#include "../../peep/Peep.h" -#include "../../peep/Staff.h" #include "../../ride/Ride.h" #include "../../ride/Track.h" #include "../../ride/TrackDesign.h" diff --git a/src/openrct2/paint/tile_element/Paint.Surface.cpp b/src/openrct2/paint/tile_element/Paint.Surface.cpp index be4cdf1ad2..6391e06643 100644 --- a/src/openrct2/paint/tile_element/Paint.Surface.cpp +++ b/src/openrct2/paint/tile_element/Paint.Surface.cpp @@ -17,14 +17,14 @@ #include "../../core/Numerics.hpp" #include "../../drawing/Drawing.h" #include "../../entity/Entity.h" +#include "../../entity/Peep.h" +#include "../../entity/Staff.h" #include "../../interface/Colour.h" #include "../../interface/Viewport.h" #include "../../object/ObjectManager.h" #include "../../object/TerrainEdgeObject.h" #include "../../object/TerrainSurfaceObject.h" #include "../../paint/Paint.h" -#include "../../peep/Peep.h" -#include "../../peep/Staff.h" #include "../../ride/TrackDesign.h" #include "../../sprites.h" #include "../../world/Surface.h" diff --git a/src/openrct2/peep/GuestPathfinding.cpp b/src/openrct2/peep/GuestPathfinding.cpp index a5b9f0dc93..47751d1f25 100644 --- a/src/openrct2/peep/GuestPathfinding.cpp +++ b/src/openrct2/peep/GuestPathfinding.cpp @@ -10,6 +10,8 @@ #include "GuestPathfinding.h" #include "../core/Guard.hpp" +#include "../entity/Guest.h" +#include "../entity/Staff.h" #include "../ride/RideData.h" #include "../ride/Station.h" #include "../ride/Track.h" @@ -17,8 +19,6 @@ #include "../util/Util.h" #include "../world/Entrance.h" #include "../world/Footpath.h" -#include "Guest.h" -#include "Staff.h" #include #include diff --git a/src/openrct2/peep/PeepData.cpp b/src/openrct2/peep/PeepData.cpp index 8887c59d80..7b724c9cd6 100644 --- a/src/openrct2/peep/PeepData.cpp +++ b/src/openrct2/peep/PeepData.cpp @@ -7,7 +7,7 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "Peep.h" +#include "../entity/Peep.h" #include diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index ff8bee8b0d..fb57005f1b 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -31,6 +31,8 @@ #include "../entity/Litter.h" #include "../entity/MoneyEffect.h" #include "../entity/Particle.h" +#include "../entity/Peep.h" +#include "../entity/Staff.h" #include "../interface/Window.h" #include "../localisation/Date.h" #include "../localisation/Localisation.h" @@ -41,9 +43,7 @@ #include "../object/ObjectList.h" #include "../object/ObjectManager.h" #include "../object/ObjectRepository.h" -#include "../peep/Peep.h" #include "../peep/RideUseSystem.h" -#include "../peep/Staff.h" #include "../ride/RideData.h" #include "../ride/Station.h" #include "../ride/Track.h" diff --git a/src/openrct2/rct1/Tables.h b/src/openrct2/rct1/Tables.h index b9cdeac19a..7443241e47 100644 --- a/src/openrct2/rct1/Tables.h +++ b/src/openrct2/rct1/Tables.h @@ -10,7 +10,7 @@ #pragma once #include "../common.h" -#include "../peep/Peep.h" +#include "../entity/Peep.h" #include diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index c72d06fbe0..e25fb35359 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -28,9 +28,11 @@ #include "../entity/EntityRegistry.h" #include "../entity/EntityTweener.h" #include "../entity/Fountain.h" +#include "../entity/Guest.h" #include "../entity/Litter.h" #include "../entity/MoneyEffect.h" #include "../entity/Particle.h" +#include "../entity/Staff.h" #include "../interface/Viewport.h" #include "../localisation/Date.h" #include "../localisation/Localisation.h" @@ -44,9 +46,7 @@ #include "../object/ObjectList.h" #include "../object/ObjectManager.h" #include "../object/ObjectRepository.h" -#include "../peep/Guest.h" #include "../peep/RideUseSystem.h" -#include "../peep/Staff.h" #include "../rct12/RCT12.h" #include "../rct12/SawyerChunkReader.h" #include "../rct12/SawyerEncoding.h" diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index a437d50866..91edecca26 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -26,6 +26,8 @@ #include "../core/Guard.hpp" #include "../core/Numerics.hpp" #include "../entity/EntityRegistry.h" +#include "../entity/Peep.h" +#include "../entity/Staff.h" #include "../interface/Window.h" #include "../localisation/Date.h" #include "../localisation/Localisation.h" @@ -39,8 +41,6 @@ #include "../object/RideObject.h" #include "../object/StationObject.h" #include "../paint/VirtualFloor.h" -#include "../peep/Peep.h" -#include "../peep/Staff.h" #include "../rct1/RCT1.h" #include "../scenario/Scenario.h" #include "../ui/UiContext.h" diff --git a/src/openrct2/ride/RideConstruction.cpp b/src/openrct2/ride/RideConstruction.cpp index 132c423fd0..df1bde8e3a 100644 --- a/src/openrct2/ride/RideConstruction.cpp +++ b/src/openrct2/ride/RideConstruction.cpp @@ -18,12 +18,12 @@ #include "../entity/Entity.h" #include "../entity/EntityList.h" #include "../entity/EntityRegistry.h" +#include "../entity/Staff.h" #include "../interface/Window.h" #include "../localisation/Date.h" #include "../localisation/Localisation.h" #include "../network/network.h" #include "../paint/VirtualFloor.h" -#include "../peep/Staff.h" #include "../ui/UiContext.h" #include "../ui/WindowManager.h" #include "../util/Util.h" diff --git a/src/openrct2/ride/ShopItem.cpp b/src/openrct2/ride/ShopItem.cpp index 27fa5f9a9b..b74af88b47 100644 --- a/src/openrct2/ride/ShopItem.cpp +++ b/src/openrct2/ride/ShopItem.cpp @@ -10,8 +10,8 @@ #include "ShopItem.h" #include "../common.h" +#include "../entity/Guest.h" #include "../localisation/StringIds.h" -#include "../peep/Guest.h" #include "../ride/RideEntry.h" #include "../sprites.h" diff --git a/src/openrct2/ride/Station.cpp b/src/openrct2/ride/Station.cpp index 99e521f102..dd18e22caf 100644 --- a/src/openrct2/ride/Station.cpp +++ b/src/openrct2/ride/Station.cpp @@ -10,7 +10,7 @@ #include "Station.h" #include "../Game.h" -#include "../peep/Guest.h" +#include "../entity/Guest.h" #include "../scenario/Scenario.h" #include "../world/Location.hpp" #include "RideEntry.h" diff --git a/src/openrct2/ride/gentle/FerrisWheel.cpp b/src/openrct2/ride/gentle/FerrisWheel.cpp index 0abbf41026..2cd8647e05 100644 --- a/src/openrct2/ride/gentle/FerrisWheel.cpp +++ b/src/openrct2/ride/gentle/FerrisWheel.cpp @@ -8,10 +8,10 @@ *****************************************************************************/ #include "../../entity/Entity.h" +#include "../../entity/Guest.h" #include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" -#include "../../peep/Guest.h" #include "../Ride.h" #include "../RideEntry.h" #include "../Track.h" diff --git a/src/openrct2/ride/gentle/MiniGolf.cpp b/src/openrct2/ride/gentle/MiniGolf.cpp index 3d1d9e83ce..fabe6f5440 100644 --- a/src/openrct2/ride/gentle/MiniGolf.cpp +++ b/src/openrct2/ride/gentle/MiniGolf.cpp @@ -9,10 +9,10 @@ #include "../../config/Config.h" #include "../../entity/Entity.h" +#include "../../entity/Guest.h" #include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" -#include "../../peep/Guest.h" #include "../../world/Map.h" #include "../../world/Surface.h" #include "../RideData.h" diff --git a/src/openrct2/ride/gentle/SpaceRings.cpp b/src/openrct2/ride/gentle/SpaceRings.cpp index 70ef448fa3..106cfd76af 100644 --- a/src/openrct2/ride/gentle/SpaceRings.cpp +++ b/src/openrct2/ride/gentle/SpaceRings.cpp @@ -9,10 +9,10 @@ #include "../../common.h" #include "../../entity/Entity.h" +#include "../../entity/Guest.h" #include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" -#include "../../peep/Guest.h" #include "../RideEntry.h" #include "../Track.h" #include "../TrackPaint.h" diff --git a/src/openrct2/scenario/Scenario.cpp b/src/openrct2/scenario/Scenario.cpp index d2247e14da..8bab0b8521 100644 --- a/src/openrct2/scenario/Scenario.cpp +++ b/src/openrct2/scenario/Scenario.cpp @@ -21,6 +21,8 @@ #include "../core/Guard.hpp" #include "../core/Random.hpp" #include "../entity/Duck.h" +#include "../entity/Guest.h" +#include "../entity/Staff.h" #include "../interface/Viewport.h" #include "../localisation/Date.h" #include "../localisation/Localisation.h" @@ -33,8 +35,6 @@ #include "../object/Object.h" #include "../object/ObjectList.h" #include "../object/ObjectManager.h" -#include "../peep/Guest.h" -#include "../peep/Staff.h" #include "../platform/platform.h" #include "../rct1/RCT1.h" #include "../rct12/RCT12.h" diff --git a/src/openrct2/scripting/bindings/entity/ScEntity.hpp b/src/openrct2/scripting/bindings/entity/ScEntity.hpp index b08067f26a..cae3562a8d 100644 --- a/src/openrct2/scripting/bindings/entity/ScEntity.hpp +++ b/src/openrct2/scripting/bindings/entity/ScEntity.hpp @@ -15,7 +15,7 @@ # include "../../../common.h" # include "../../../entity/EntityList.h" # include "../../../entity/EntityRegistry.h" -# include "../../../peep/Peep.h" +# include "../../../entity/Peep.h" # include "../../../util/Util.h" # include "../../Duktape.hpp" # include "../../ScriptEngine.h" diff --git a/src/openrct2/scripting/bindings/entity/ScGuest.cpp b/src/openrct2/scripting/bindings/entity/ScGuest.cpp index e5d0901b52..fc5e715e93 100644 --- a/src/openrct2/scripting/bindings/entity/ScGuest.cpp +++ b/src/openrct2/scripting/bindings/entity/ScGuest.cpp @@ -11,7 +11,7 @@ # include "ScGuest.hpp" -# include "../../../peep/Guest.h" +# include "../../../entity/Guest.h" namespace OpenRCT2::Scripting { diff --git a/src/openrct2/scripting/bindings/entity/ScStaff.cpp b/src/openrct2/scripting/bindings/entity/ScStaff.cpp index 717eb69d0e..5f9b13bd10 100644 --- a/src/openrct2/scripting/bindings/entity/ScStaff.cpp +++ b/src/openrct2/scripting/bindings/entity/ScStaff.cpp @@ -11,7 +11,7 @@ # include "ScStaff.hpp" -# include "../../../peep/Staff.h" +# include "../../../entity/Staff.h" namespace OpenRCT2::Scripting { diff --git a/src/openrct2/scripting/bindings/world/ScMap.cpp b/src/openrct2/scripting/bindings/world/ScMap.cpp index 405b45fb04..2b16f0f0d8 100644 --- a/src/openrct2/scripting/bindings/world/ScMap.cpp +++ b/src/openrct2/scripting/bindings/world/ScMap.cpp @@ -16,11 +16,11 @@ # include "../../../entity/Duck.h" # include "../../../entity/EntityList.h" # include "../../../entity/Fountain.h" +# include "../../../entity/Guest.h" # include "../../../entity/Litter.h" # include "../../../entity/MoneyEffect.h" # include "../../../entity/Particle.h" -# include "../../../peep/Guest.h" -# include "../../../peep/Staff.h" +# include "../../../entity/Staff.h" # include "../../../ride/Ride.h" # include "../../../ride/TrainManager.h" # include "../../../world/Map.h" diff --git a/src/openrct2/scripting/bindings/world/ScPark.cpp b/src/openrct2/scripting/bindings/world/ScPark.cpp index b411dfcda1..1f21a1c920 100644 --- a/src/openrct2/scripting/bindings/world/ScPark.cpp +++ b/src/openrct2/scripting/bindings/world/ScPark.cpp @@ -15,9 +15,9 @@ # include "../../../GameState.h" # include "../../../common.h" # include "../../../core/String.hpp" +# include "../../../entity/Guest.h" # include "../../../management/Finance.h" # include "../../../management/NewsItem.h" -# include "../../../peep/Guest.h" # include "../../../windows/Intent.h" # include "../../../world/Park.h" # include "../../Duktape.hpp" diff --git a/src/openrct2/scripting/bindings/world/ScParkMessage.cpp b/src/openrct2/scripting/bindings/world/ScParkMessage.cpp index 0df7790750..1b1a348fba 100644 --- a/src/openrct2/scripting/bindings/world/ScParkMessage.cpp +++ b/src/openrct2/scripting/bindings/world/ScParkMessage.cpp @@ -15,9 +15,9 @@ # include "../../../GameState.h" # include "../../../common.h" # include "../../../core/String.hpp" +# include "../../../entity/Peep.h" # include "../../../management/Finance.h" # include "../../../management/NewsItem.h" -# include "../../../peep/Peep.h" # include "../../../windows/Intent.h" # include "../../../world/Park.h" # include "../../Duktape.hpp" diff --git a/src/openrct2/windows/_legacy.cpp b/src/openrct2/windows/_legacy.cpp index bcb945d8e5..22458f873b 100644 --- a/src/openrct2/windows/_legacy.cpp +++ b/src/openrct2/windows/_legacy.cpp @@ -13,10 +13,10 @@ #include "../Input.h" #include "../actions/TrackPlaceAction.h" #include "../audio/audio.h" +#include "../entity/Staff.h" #include "../interface/Viewport.h" #include "../network/network.h" #include "../paint/VirtualFloor.h" -#include "../peep/Staff.h" #include "../ride/RideData.h" #include "../ride/Track.h" #include "../ride/TrackData.h" diff --git a/src/openrct2/world/MapAnimation.cpp b/src/openrct2/world/MapAnimation.cpp index 8ae4e93391..0d43fc0e26 100644 --- a/src/openrct2/world/MapAnimation.cpp +++ b/src/openrct2/world/MapAnimation.cpp @@ -12,9 +12,9 @@ #include "../Context.h" #include "../Game.h" #include "../entity/EntityList.h" +#include "../entity/Peep.h" #include "../interface/Viewport.h" #include "../object/StationObject.h" -#include "../peep/Peep.h" #include "../ride/Ride.h" #include "../ride/RideData.h" #include "../ride/Track.h" diff --git a/src/openrct2/world/Park.cpp b/src/openrct2/world/Park.cpp index 2aa4df84b7..1993573ed1 100644 --- a/src/openrct2/world/Park.cpp +++ b/src/openrct2/world/Park.cpp @@ -20,6 +20,8 @@ #include "../core/Memory.hpp" #include "../core/String.hpp" #include "../entity/Litter.h" +#include "../entity/Peep.h" +#include "../entity/Staff.h" #include "../interface/Colour.h" #include "../interface/Window.h" #include "../localisation/Localisation.h" @@ -28,8 +30,6 @@ #include "../management/Marketing.h" #include "../management/Research.h" #include "../network/network.h" -#include "../peep/Peep.h" -#include "../peep/Staff.h" #include "../ride/Ride.h" #include "../ride/RideData.h" #include "../ride/ShopItem.h" diff --git a/test/tests/Pathfinding.cpp b/test/tests/Pathfinding.cpp index 872f0e2537..01d0a12bfd 100644 --- a/test/tests/Pathfinding.cpp +++ b/test/tests/Pathfinding.cpp @@ -1,6 +1,6 @@ #include "TestData.h" #include "openrct2/core/StringReader.h" -#include "openrct2/peep/Guest.h" +#include "openrct2/entity/Guest.h" #include "openrct2/peep/GuestPathfinding.h" #include "openrct2/ride/Station.h" #include "openrct2/scenario/Scenario.h" diff --git a/test/tests/PlayTests.cpp b/test/tests/PlayTests.cpp index f4a4a3230e..1664002918 100644 --- a/test/tests/PlayTests.cpp +++ b/test/tests/PlayTests.cpp @@ -19,8 +19,8 @@ #include #include #include +#include #include -#include #include #include #include