From 20d3b50771fe32abe6b66fc8e19825879e2596cf Mon Sep 17 00:00:00 2001
From: ZehMatt <m.moninger.h@gmail.com>
Date: Wed, 25 Aug 2021 17:33:06 +0300
Subject: [PATCH] Correct includes for EntityBase.h

---
 src/openrct2/peep/Peep.h           | 2 +-
 src/openrct2/ride/Vehicle.h        | 2 +-
 src/openrct2/world/Balloon.h       | 2 +-
 src/openrct2/world/Duck.h          | 2 +-
 src/openrct2/world/Entity.h        | 2 +-
 src/openrct2/world/EntityList.h    | 2 +-
 src/openrct2/world/EntityTweener.h | 2 +-
 src/openrct2/world/Fountain.h      | 2 +-
 src/openrct2/world/Litter.h        | 2 +-
 src/openrct2/world/MoneyEffect.h   | 2 +-
 src/openrct2/world/Particle.h      | 2 +-
 src/openrct2/world/Sprite.h        | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/openrct2/peep/Peep.h b/src/openrct2/peep/Peep.h
index eb659b6760..41d2660ab7 100644
--- a/src/openrct2/peep/Peep.h
+++ b/src/openrct2/peep/Peep.h
@@ -16,8 +16,8 @@
 #include "../ride/RideTypes.h"
 #include "../ride/ShopItem.h"
 #include "../util/Util.h"
+#include "../world/EntityBase.h"
 #include "../world/Location.hpp"
-#include "../world/SpriteBase.h"
 
 #include <algorithm>
 #include <bitset>
diff --git a/src/openrct2/ride/Vehicle.h b/src/openrct2/ride/Vehicle.h
index 018ac852ea..d99463ae12 100644
--- a/src/openrct2/ride/Vehicle.h
+++ b/src/openrct2/ride/Vehicle.h
@@ -12,8 +12,8 @@
 #include "../audio/audio.h"
 #include "../common.h"
 #include "../ride/RideTypes.h"
+#include "../world/EntityBase.h"
 #include "../world/Location.hpp"
-#include "../world/SpriteBase.h"
 #include "Station.h"
 #include "VehicleColour.h"
 #include "VehicleEntry.h"
diff --git a/src/openrct2/world/Balloon.h b/src/openrct2/world/Balloon.h
index 46cc2e611e..f7b95c15fd 100644
--- a/src/openrct2/world/Balloon.h
+++ b/src/openrct2/world/Balloon.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "SpriteBase.h"
+#include "EntityBase.h"
 
 class DataSerialiser;
 struct CoordsXYZ;
diff --git a/src/openrct2/world/Duck.h b/src/openrct2/world/Duck.h
index feef90e15e..0eeb867f83 100644
--- a/src/openrct2/world/Duck.h
+++ b/src/openrct2/world/Duck.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "SpriteBase.h"
+#include "EntityBase.h"
 
 class DataSerialiser;
 struct CoordsXY;
diff --git a/src/openrct2/world/Entity.h b/src/openrct2/world/Entity.h
index e2e6fd7cd4..6c1831232c 100644
--- a/src/openrct2/world/Entity.h
+++ b/src/openrct2/world/Entity.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "SpriteBase.h"
+#include "EntityBase.h"
 
 constexpr uint16_t MAX_ENTITIES = 10000;
 
diff --git a/src/openrct2/world/EntityList.h b/src/openrct2/world/EntityList.h
index 2c43d33c9f..db09b04e6b 100644
--- a/src/openrct2/world/EntityList.h
+++ b/src/openrct2/world/EntityList.h
@@ -12,8 +12,8 @@
 #include "../common.h"
 #include "../rct12/RCT12.h"
 #include "Entity.h"
+#include "EntityBase.h"
 #include "Location.hpp"
-#include "SpriteBase.h"
 
 #include <list>
 #include <vector>
diff --git a/src/openrct2/world/EntityTweener.h b/src/openrct2/world/EntityTweener.h
index 7e6dfaf843..7d2c5da027 100644
--- a/src/openrct2/world/EntityTweener.h
+++ b/src/openrct2/world/EntityTweener.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "SpriteBase.h"
+#include "EntityBase.h"
 
 #include <vector>
 
diff --git a/src/openrct2/world/Fountain.h b/src/openrct2/world/Fountain.h
index 068c9a0dcc..5f33fa54fd 100644
--- a/src/openrct2/world/Fountain.h
+++ b/src/openrct2/world/Fountain.h
@@ -10,8 +10,8 @@
 #pragma once
 
 #include "../common.h"
+#include "EntityBase.h"
 #include "Map.h"
-#include "SpriteBase.h"
 
 class DataSerialiser;
 
diff --git a/src/openrct2/world/Litter.h b/src/openrct2/world/Litter.h
index b1cfe0a62f..84e8d01121 100644
--- a/src/openrct2/world/Litter.h
+++ b/src/openrct2/world/Litter.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "SpriteBase.h"
+#include "EntityBase.h"
 
 class DataSerialiser;
 struct CoordsXYZ;
diff --git a/src/openrct2/world/MoneyEffect.h b/src/openrct2/world/MoneyEffect.h
index bd48992c51..1ea4647135 100644
--- a/src/openrct2/world/MoneyEffect.h
+++ b/src/openrct2/world/MoneyEffect.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "SpriteBase.h"
+#include "EntityBase.h"
 
 class DataSerialiser;
 struct CoordsXYZ;
diff --git a/src/openrct2/world/Particle.h b/src/openrct2/world/Particle.h
index 53ba024785..5eaa81b522 100644
--- a/src/openrct2/world/Particle.h
+++ b/src/openrct2/world/Particle.h
@@ -10,7 +10,7 @@
 #pragma once
 
 #include "../ride/VehicleColour.h"
-#include "SpriteBase.h"
+#include "EntityBase.h"
 
 class DataSerialiser;
 struct CoordsXYZ;
diff --git a/src/openrct2/world/Sprite.h b/src/openrct2/world/Sprite.h
index 14db05fa25..b2fd41374c 100644
--- a/src/openrct2/world/Sprite.h
+++ b/src/openrct2/world/Sprite.h
@@ -10,7 +10,7 @@
 #pragma once
 
 #include "../common.h"
-#include "SpriteBase.h"
+#include "EntityBase.h"
 
 #include <array>