Adjust includes

src/openrct2-ui/windows/GameBottomToolbar.cpp

@@ -17,7 +17,7 @@
 #include <openrct2/Input.h>
 #include <openrct2/OpenRCT2.h>
 #include <openrct2/config/Config.h>
-#include <openrct2/entity/Entity.h>
+#include <openrct2/entity/EntityRegistry.h>
 #include <openrct2/entity/Guest.h>
 #include <openrct2/entity/Staff.h>
 #include <openrct2/localisation/Date.h>

src/openrct2-ui/windows/News.cpp

@@ -13,7 +13,7 @@
 #include <openrct2/Context.h>
 #include <openrct2/audio/audio.h>
 #include <openrct2/drawing/Drawing.h>
-#include <openrct2/entity/Entity.h>
+#include <openrct2/entity/EntityRegistry.h>
 #include <openrct2/entity/Peep.h>
 #include <openrct2/entity/Staff.h>
 #include <openrct2/localisation/Localisation.h>

src/openrct2-ui/windows/Staff.cpp

@@ -21,7 +21,7 @@
 #include <openrct2/actions/StaffSetOrdersAction.h>
 #include <openrct2/actions/StaffSetPatrolAreaAction.h>
 #include <openrct2/config/Config.h>
-#include <openrct2/entity/Entity.h>
+#include <openrct2/entity/EntityRegistry.h>
 #include <openrct2/entity/Staff.h>
 #include <openrct2/localisation/Localisation.h>
 #include <openrct2/management/Finance.h>

src/openrct2-ui/windows/StaffFirePrompt.cpp

@@ -12,7 +12,7 @@
 #include <openrct2/Game.h>
 #include <openrct2/actions/StaffFireAction.h>
 #include <openrct2/drawing/Drawing.h>
-#include <openrct2/entity/Entity.h>
+#include <openrct2/entity/EntityRegistry.h>
 #include <openrct2/entity/Staff.h>
 #include <openrct2/interface/Colour.h>
 #include <openrct2/localisation/Localisation.h>

src/openrct2-ui/windows/TitleCommandEditor.cpp

@@ -21,7 +21,6 @@
 #include <openrct2/drawing/Drawing.h>
 #include <openrct2/entity/Balloon.h>
 #include <openrct2/entity/Duck.h>
-#include <openrct2/entity/Entity.h>
 #include <openrct2/entity/Peep.h>
 #include <openrct2/localisation/Localisation.h>
 #include <openrct2/ride/Vehicle.h>

src/openrct2/actions/BalloonPressAction.cpp

@@ -10,7 +10,7 @@
 #include "BalloonPressAction.h"
 
 #include "../entity/Balloon.h"
-#include "../entity/Entity.h"
+#include "../entity/EntityRegistry.h"
 #include "GameAction.h"
 
 BalloonPressAction::BalloonPressAction(uint16_t spriteIndex)

src/openrct2/actions/GuestSetFlagsAction.cpp

@@ -11,7 +11,7 @@
 
 #include "../Context.h"
 #include "../OpenRCT2.h"
-#include "../entity/Entity.h"
+#include "../entity/EntityRegistry.h"
 
 GuestSetFlagsAction::GuestSetFlagsAction(uint16_t peepId, uint32_t flags)
     : _peepId(peepId)

src/openrct2/actions/GuestSetNameAction.cpp

@@ -13,7 +13,7 @@
 #include "../Context.h"
 #include "../core/MemoryStream.h"
 #include "../drawing/Drawing.h"
-#include "../entity/Entity.h"
+#include "../entity/EntityRegistry.h"
 #include "../interface/Window.h"
 #include "../localisation/Localisation.h"
 #include "../localisation/StringIds.h"

src/openrct2/actions/PeepPickupAction.cpp

@@ -10,7 +10,7 @@
 #include "PeepPickupAction.h"
 
 #include "../Input.h"
-#include "../entity/Entity.h"
+#include "../entity/EntityRegistry.h"
 #include "../entity/Peep.h"
 #include "../network/network.h"
 #include "../util/Util.h"

src/openrct2/actions/StaffFireAction.cpp

@@ -9,7 +9,7 @@
 
 #include "StaffFireAction.h"
 
-#include "../entity/Entity.h"
+#include "../entity/EntityRegistry.h"
 #include "../entity/Staff.h"
 #include "../interface/Window.h"
 

src/openrct2/actions/StaffSetCostumeAction.cpp

@@ -10,7 +10,7 @@
 #include "StaffSetCostumeAction.h"
 
 #include "../Context.h"
-#include "../entity/Entity.h"
+#include "../entity/EntityRegistry.h"
 #include "../interface/Window.h"
 #include "../localisation/Localisation.h"
 #include "../localisation/StringIds.h"

src/openrct2/actions/StaffSetNameAction.cpp

@@ -13,7 +13,7 @@
 #include "../Context.h"
 #include "../core/MemoryStream.h"
 #include "../drawing/Drawing.h"
-#include "../entity/Entity.h"
+#include "../entity/EntityRegistry.h"
 #include "../entity/Staff.h"
 #include "../interface/Window.h"
 #include "../localisation/Localisation.h"

src/openrct2/actions/StaffSetOrdersAction.cpp

@@ -10,7 +10,7 @@
 #include "StaffSetOrdersAction.h"
 
 #include "../Context.h"
-#include "../entity/Entity.h"
+#include "../entity/EntityRegistry.h"
 #include "../entity/Staff.h"
 #include "../interface/Window.h"
 #include "../localisation/Localisation.h"

src/openrct2/actions/StaffSetPatrolAreaAction.cpp

@@ -9,7 +9,7 @@
 
 #include "StaffSetPatrolAreaAction.h"
 
-#include "../entity/Entity.h"
+#include "../entity/EntityRegistry.h"
 #include "../entity/Peep.h"
 #include "../entity/Staff.h"
 #include "../interface/Window.h"

src/openrct2/drawing/LightFX.cpp

@@ -14,7 +14,7 @@
 #    include "../Game.h"
 #    include "../common.h"
 #    include "../config/Config.h"
-#    include "../entity/Entity.h"
+#    include "../entity/EntityRegistry.h"
 #    include "../interface/Viewport.h"
 #    include "../interface/Window.h"
 #    include "../interface/Window_internal.h"

src/openrct2/entity/EntityList.h

@@ -12,8 +12,8 @@
 #include "../common.h"
 #include "../rct12/RCT12.h"
 #include "../world/Location.hpp"
-#include "Entity.h"
 #include "EntityBase.h"
+#include "EntityRegistry.h"
 
 #include <list>
 #include <vector>

src/openrct2/entity/MoneyEffect.cpp

@@ -16,7 +16,6 @@
 #include "../localisation/Localisation.h"
 #include "../network/network.h"
 #include "../world/Map.h"
-#include "Entity.h"
 #include "EntityRegistry.h"
 
 static constexpr const CoordsXY _moneyEffectMoveOffset[] = {

src/openrct2/interface/Window_internal.cpp

@@ -1,7 +1,7 @@
 #include "Window_internal.h"
 
-#include "../entity/Entity.h"
 #include "../entity/EntityList.h"
+#include "../entity/EntityRegistry.h"
 #include "Viewport.h"
 
 void rct_window::SetLocation(const CoordsXYZ& coords)

src/openrct2/management/NewsItem.cpp

@@ -13,7 +13,7 @@
 #include "../Input.h"
 #include "../OpenRCT2.h"
 #include "../audio/audio.h"
-#include "../entity/Entity.h"
+#include "../entity/EntityRegistry.h"
 #include "../entity/Peep.h"
 #include "../interface/Window.h"
 #include "../interface/Window_internal.h"

src/openrct2/paint/tile_element/Paint.Path.cpp

@@ -12,7 +12,7 @@
 #include "../../config/Config.h"
 #include "../../core/Numerics.hpp"
 #include "../../drawing/LightFX.h"
-#include "../../entity/Entity.h"
+#include "../../entity/EntityRegistry.h"
 #include "../../entity/Peep.h"
 #include "../../entity/Staff.h"
 #include "../../interface/Viewport.h"

src/openrct2/paint/tile_element/Paint.Surface.cpp

@@ -16,7 +16,7 @@
 #include "../../core/Guard.hpp"
 #include "../../core/Numerics.hpp"
 #include "../../drawing/Drawing.h"
-#include "../../entity/Entity.h"
+#include "../../entity/EntityRegistry.h"
 #include "../../entity/Peep.h"
 #include "../../entity/Staff.h"
 #include "../../interface/Colour.h"

src/openrct2/ride/RideConstruction.cpp

@@ -15,7 +15,6 @@
 #include "../actions/RideSetVehicleAction.h"
 #include "../actions/TrackRemoveAction.h"
 #include "../common.h"
-#include "../entity/Entity.h"
 #include "../entity/EntityList.h"
 #include "../entity/EntityRegistry.h"
 #include "../entity/Staff.h"

src/openrct2/ride/TrainManager.cpp

@@ -9,8 +9,8 @@
 
 #include "TrainManager.h"
 
-#include "../entity/Entity.h"
 #include "../entity/EntityList.h"
+#include "../entity/EntityRegistry.h"
 #include "Vehicle.h"
 
 namespace TrainManager

src/openrct2/ride/VehiclePaint.cpp

@@ -12,7 +12,7 @@
 #include "../Game.h"
 #include "../drawing/Drawing.h"
 #include "../drawing/LightFX.h"
-#include "../entity/Entity.h"
+#include "../entity/EntityRegistry.h"
 #include "../interface/Viewport.h"
 #include "../paint/Paint.h"
 #include "../paint/sprite/Paint.Sprite.h"

src/openrct2/ride/coaster/ReverserRollerCoaster.cpp

@@ -8,7 +8,7 @@
  *****************************************************************************/
 
 #include "../../drawing/Drawing.h"
-#include "../../entity/Entity.h"
+#include "../../entity/EntityRegistry.h"
 #include "../../interface/Viewport.h"
 #include "../../paint/Paint.h"
 #include "../../paint/Supports.h"

src/openrct2/ride/gentle/Circus.cpp

@@ -7,7 +7,7 @@
  * OpenRCT2 is licensed under the GNU General Public License version 3.
  *****************************************************************************/
 
-#include "../../entity/Entity.h"
+#include "../../entity/EntityRegistry.h"
 #include "../../interface/Viewport.h"
 #include "../../paint/Paint.h"
 #include "../../paint/Supports.h"

src/openrct2/ride/gentle/CrookedHouse.cpp

@@ -7,7 +7,7 @@
  * OpenRCT2 is licensed under the GNU General Public License version 3.
  *****************************************************************************/
 
-#include "../../entity/Entity.h"
+#include "../../entity/EntityRegistry.h"
 #include "../../interface/Viewport.h"
 #include "../../paint/Paint.h"
 #include "../../paint/Supports.h"

src/openrct2/ride/gentle/FerrisWheel.cpp

@@ -7,7 +7,7 @@
  * OpenRCT2 is licensed under the GNU General Public License version 3.
  *****************************************************************************/
 
-#include "../../entity/Entity.h"
+#include "../../entity/EntityRegistry.h"
 #include "../../entity/Guest.h"
 #include "../../interface/Viewport.h"
 #include "../../paint/Paint.h"

src/openrct2/ride/gentle/HauntedHouse.cpp

@@ -7,7 +7,7 @@
  * OpenRCT2 is licensed under the GNU General Public License version 3.
  *****************************************************************************/
 
-#include "../../entity/Entity.h"
+#include "../../entity/EntityRegistry.h"
 #include "../../interface/Viewport.h"
 #include "../../paint/Paint.h"
 #include "../../paint/Supports.h"

src/openrct2/ride/gentle/MerryGoRound.cpp

@@ -7,7 +7,7 @@
  * OpenRCT2 is licensed under the GNU General Public License version 3.
  *****************************************************************************/
 
-#include "../../entity/Entity.h"
+#include "../../entity/EntityRegistry.h"
 #include "../../interface/Viewport.h"
 #include "../../paint/Paint.h"
 #include "../../paint/Supports.h"

src/openrct2/ride/gentle/MiniGolf.cpp

@@ -8,7 +8,7 @@
  *****************************************************************************/
 
 #include "../../config/Config.h"
-#include "../../entity/Entity.h"
+#include "../../entity/EntityRegistry.h"
 #include "../../entity/Guest.h"
 #include "../../interface/Viewport.h"
 #include "../../paint/Paint.h"

src/openrct2/ride/gentle/SpaceRings.cpp

@@ -8,7 +8,7 @@
  *****************************************************************************/
 
 #include "../../common.h"
-#include "../../entity/Entity.h"
+#include "../../entity/EntityRegistry.h"
 #include "../../entity/Guest.h"
 #include "../../interface/Viewport.h"
 #include "../../paint/Paint.h"

src/openrct2/ride/thrill/3dCinema.cpp

@@ -7,7 +7,7 @@
  * OpenRCT2 is licensed under the GNU General Public License version 3.
  *****************************************************************************/
 
-#include "../../entity/Entity.h"
+#include "../../entity/EntityRegistry.h"
 #include "../../interface/Viewport.h"
 #include "../../paint/Paint.h"
 #include "../../paint/Supports.h"

src/openrct2/ride/thrill/Enterprise.cpp

@@ -8,7 +8,7 @@
  *****************************************************************************/
 
 #include "../../common.h"
-#include "../../entity/Entity.h"
+#include "../../entity/EntityRegistry.h"
 #include "../../interface/Viewport.h"
 #include "../../paint/Paint.h"
 #include "../../paint/Supports.h"

src/openrct2/ride/thrill/MagicCarpet.cpp

@@ -7,7 +7,7 @@
  * OpenRCT2 is licensed under the GNU General Public License version 3.
  *****************************************************************************/
 
-#include "../../entity/Entity.h"
+#include "../../entity/EntityRegistry.h"
 #include "../../interface/Viewport.h"
 #include "../../object/StationObject.h"
 #include "../../paint/Paint.h"

src/openrct2/ride/thrill/MotionSimulator.cpp

@@ -7,7 +7,7 @@
  * OpenRCT2 is licensed under the GNU General Public License version 3.
  *****************************************************************************/
 
-#include "../../entity/Entity.h"
+#include "../../entity/EntityRegistry.h"
 #include "../../interface/Viewport.h"
 #include "../../paint/Paint.h"
 #include "../../paint/Supports.h"

src/openrct2/ride/thrill/SwingingInverterShip.cpp

@@ -7,7 +7,7 @@
  * OpenRCT2 is licensed under the GNU General Public License version 3.
  *****************************************************************************/
 
-#include "../../entity/Entity.h"
+#include "../../entity/EntityRegistry.h"
 #include "../../interface/Viewport.h"
 #include "../../object/StationObject.h"
 #include "../../paint/Paint.h"

src/openrct2/ride/thrill/SwingingShip.cpp

@@ -7,7 +7,7 @@
  * OpenRCT2 is licensed under the GNU General Public License version 3.
  *****************************************************************************/
 
-#include "../../entity/Entity.h"
+#include "../../entity/EntityRegistry.h"
 #include "../../interface/Viewport.h"
 #include "../../object/StationObject.h"
 #include "../../paint/Paint.h"

src/openrct2/ride/thrill/TopSpin.cpp

@@ -7,7 +7,7 @@
  * OpenRCT2 is licensed under the GNU General Public License version 3.
  *****************************************************************************/
 
-#include "../../entity/Entity.h"
+#include "../../entity/EntityRegistry.h"
 #include "../../interface/Viewport.h"
 #include "../../localisation/Localisation.h"
 #include "../../paint/Paint.h"

src/openrct2/ride/thrill/Twist.cpp

@@ -8,7 +8,7 @@
  *****************************************************************************/
 
 #include "../../common.h"
-#include "../../entity/Entity.h"
+#include "../../entity/EntityRegistry.h"
 #include "../../interface/Viewport.h"
 #include "../../paint/Paint.h"
 #include "../../paint/Supports.h"

src/openrct2/ride/water/SplashBoats.cpp

@@ -8,7 +8,7 @@
  *****************************************************************************/
 
 #include "../../config/Config.h"
-#include "../../entity/Entity.h"
+#include "../../entity/EntityRegistry.h"
 #include "../../interface/Viewport.h"
 #include "../../paint/Paint.h"
 #include "../../paint/Supports.h"