From 03fb9b390f459d1287bd8010f1ae69c3aecec141 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com> Date: Wed, 24 Nov 2021 16:58:01 +0200 Subject: [PATCH] Rename Sprite to EntityRegistry --- src/openrct2-ui/WindowManager.cpp | 2 +- src/openrct2-ui/interface/ViewportInteraction.cpp | 2 +- src/openrct2-ui/interface/Window.cpp | 2 +- src/openrct2-ui/scripting/ScTitleSequence.hpp | 2 +- src/openrct2-ui/title/TitleSequencePlayer.cpp | 2 +- src/openrct2-ui/windows/StaffList.cpp | 2 +- src/openrct2/Game.cpp | 2 +- src/openrct2/GameState.cpp | 2 +- src/openrct2/GameStateSnapshots.cpp | 2 +- src/openrct2/ParkFile.cpp | 2 +- src/openrct2/ReplayManager.cpp | 2 +- src/openrct2/actions/SetCheatAction.cpp | 2 +- src/openrct2/actions/StaffHireNewAction.cpp | 2 +- src/openrct2/entity/{Sprite.cpp => EntityRegistry.cpp} | 2 +- src/openrct2/entity/{Sprite.h => EntityRegistry.h} | 0 src/openrct2/entity/Litter.cpp | 2 +- src/openrct2/interface/InteractiveConsole.cpp | 2 +- src/openrct2/libopenrct2.vcxproj | 4 ++-- src/openrct2/network/NetworkBase.cpp | 2 +- src/openrct2/paint/tile_element/Paint.Path.cpp | 3 +-- src/openrct2/peep/Guest.cpp | 2 +- src/openrct2/peep/Peep.cpp | 2 +- src/openrct2/peep/Staff.cpp | 2 +- src/openrct2/rct1/S4Importer.cpp | 2 +- src/openrct2/rct2/S6Importer.cpp | 2 +- src/openrct2/ride/Ride.cpp | 2 +- src/openrct2/ride/RideConstruction.cpp | 2 +- src/openrct2/ride/Vehicle.cpp | 2 +- src/openrct2/ride/transport/SuspendedMonorail.cpp | 2 +- src/openrct2/scripting/bindings/entity/ScEntity.hpp | 2 +- src/openrct2/scripting/bindings/world/ScTile.cpp | 2 +- src/openrct2/scripting/bindings/world/ScTileElement.cpp | 2 +- src/openrct2/scripting/bindings/world/ScTileElement.hpp | 2 +- src/openrct2/world/Footpath.cpp | 2 +- test/tests/PlayTests.cpp | 2 +- test/tests/S6ImportExportTests.cpp | 2 +- 36 files changed, 36 insertions(+), 37 deletions(-) rename src/openrct2/entity/{Sprite.cpp => EntityRegistry.cpp} (99%) rename src/openrct2/entity/{Sprite.h => EntityRegistry.h} (100%) diff --git a/src/openrct2-ui/WindowManager.cpp b/src/openrct2-ui/WindowManager.cpp index 1fa73f6dc0..cc5b861ba7 100644 --- a/src/openrct2-ui/WindowManager.cpp +++ b/src/openrct2-ui/WindowManager.cpp @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/interface/ViewportInteraction.cpp b/src/openrct2-ui/interface/ViewportInteraction.cpp index d0503d828e..19523c86fb 100644 --- a/src/openrct2-ui/interface/ViewportInteraction.cpp +++ b/src/openrct2-ui/interface/ViewportInteraction.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/interface/Window.cpp b/src/openrct2-ui/interface/Window.cpp index 7f213856c4..c2f7df569d 100644 --- a/src/openrct2-ui/interface/Window.cpp +++ b/src/openrct2-ui/interface/Window.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/scripting/ScTitleSequence.hpp b/src/openrct2-ui/scripting/ScTitleSequence.hpp index 0ea84d6a88..411fb29c4d 100644 --- a/src/openrct2-ui/scripting/ScTitleSequence.hpp +++ b/src/openrct2-ui/scripting/ScTitleSequence.hpp @@ -16,7 +16,7 @@ # include # include # include -# include +# include # include # include # include diff --git a/src/openrct2-ui/title/TitleSequencePlayer.cpp b/src/openrct2-ui/title/TitleSequencePlayer.cpp index be1fb8b856..069ef308e6 100644 --- a/src/openrct2-ui/title/TitleSequencePlayer.cpp +++ b/src/openrct2-ui/title/TitleSequencePlayer.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/StaffList.cpp b/src/openrct2-ui/windows/StaffList.cpp index 4f6793daf7..2bb0fe4840 100644 --- a/src/openrct2-ui/windows/StaffList.cpp +++ b/src/openrct2-ui/windows/StaffList.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2/Game.cpp b/src/openrct2/Game.cpp index b04dc48f86..1a9d16fb67 100644 --- a/src/openrct2/Game.cpp +++ b/src/openrct2/Game.cpp @@ -25,7 +25,7 @@ #include "core/Console.hpp" #include "core/FileScanner.h" #include "core/Path.hpp" -#include "entity/Sprite.h" +#include "entity/EntityRegistry.h" #include "interface/Colour.h" #include "interface/Screenshot.h" #include "interface/Viewport.h" diff --git a/src/openrct2/GameState.cpp b/src/openrct2/GameState.cpp index 88dcfe67d2..ce56d00782 100644 --- a/src/openrct2/GameState.cpp +++ b/src/openrct2/GameState.cpp @@ -19,7 +19,7 @@ #include "ReplayManager.h" #include "actions/GameAction.h" #include "config/Config.h" -#include "entity/Sprite.h" +#include "entity/EntityRegistry.h" #include "interface/Screenshot.h" #include "localisation/Date.h" #include "localisation/Localisation.h" diff --git a/src/openrct2/GameStateSnapshots.cpp b/src/openrct2/GameStateSnapshots.cpp index 3a0b00dbee..bf3cf80d2f 100644 --- a/src/openrct2/GameStateSnapshots.cpp +++ b/src/openrct2/GameStateSnapshots.cpp @@ -13,11 +13,11 @@ #include "entity/Balloon.h" #include "entity/Duck.h" #include "entity/EntityList.h" +#include "entity/EntityRegistry.h" #include "entity/Fountain.h" #include "entity/Litter.h" #include "entity/MoneyEffect.h" #include "entity/Particle.h" -#include "entity/Sprite.h" #include "peep/Guest.h" #include "peep/Staff.h" #include "ride/Vehicle.h" diff --git a/src/openrct2/ParkFile.cpp b/src/openrct2/ParkFile.cpp index 7f78bf67e1..a148006835 100644 --- a/src/openrct2/ParkFile.cpp +++ b/src/openrct2/ParkFile.cpp @@ -26,11 +26,11 @@ #include "entity/Balloon.h" #include "entity/Duck.h" #include "entity/EntityList.h" +#include "entity/EntityRegistry.h" #include "entity/Fountain.h" #include "entity/Litter.h" #include "entity/MoneyEffect.h" #include "entity/Particle.h" -#include "entity/Sprite.h" #include "interface/Viewport.h" #include "interface/Window.h" #include "localisation/Date.h" diff --git a/src/openrct2/ReplayManager.cpp b/src/openrct2/ReplayManager.cpp index c6b99bc3f4..151c5d3274 100644 --- a/src/openrct2/ReplayManager.cpp +++ b/src/openrct2/ReplayManager.cpp @@ -26,8 +26,8 @@ #include "config/Config.h" #include "core/DataSerialiser.h" #include "core/Path.hpp" +#include "entity/EntityRegistry.h" #include "entity/EntityTweener.h" -#include "entity/Sprite.h" #include "management/NewsItem.h" #include "object/ObjectManager.h" #include "object/ObjectRepository.h" diff --git a/src/openrct2/actions/SetCheatAction.cpp b/src/openrct2/actions/SetCheatAction.cpp index 5d5c69e0b2..3b8c165d75 100644 --- a/src/openrct2/actions/SetCheatAction.cpp +++ b/src/openrct2/actions/SetCheatAction.cpp @@ -16,7 +16,7 @@ #include "../core/String.hpp" #include "../drawing/Drawing.h" #include "../entity/Duck.h" -#include "../entity/Sprite.h" +#include "../entity/EntityRegistry.h" #include "../localisation/Localisation.h" #include "../localisation/StringIds.h" #include "../network/network.h" diff --git a/src/openrct2/actions/StaffHireNewAction.cpp b/src/openrct2/actions/StaffHireNewAction.cpp index c643e1ca69..6944570e61 100644 --- a/src/openrct2/actions/StaffHireNewAction.cpp +++ b/src/openrct2/actions/StaffHireNewAction.cpp @@ -13,7 +13,7 @@ #include "../Context.h" #include "../core/MemoryStream.h" #include "../drawing/Drawing.h" -#include "../entity/Sprite.h" +#include "../entity/EntityRegistry.h" #include "../interface/Window.h" #include "../localisation/Localisation.h" #include "../localisation/StringIds.h" diff --git a/src/openrct2/entity/Sprite.cpp b/src/openrct2/entity/EntityRegistry.cpp similarity index 99% rename from src/openrct2/entity/Sprite.cpp rename to src/openrct2/entity/EntityRegistry.cpp index 882d9beb88..477a561116 100644 --- a/src/openrct2/entity/Sprite.cpp +++ b/src/openrct2/entity/EntityRegistry.cpp @@ -7,7 +7,7 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "Sprite.h" +#include "EntityRegistry.h" #include "../Game.h" #include "../core/ChecksumStream.h" diff --git a/src/openrct2/entity/Sprite.h b/src/openrct2/entity/EntityRegistry.h similarity index 100% rename from src/openrct2/entity/Sprite.h rename to src/openrct2/entity/EntityRegistry.h diff --git a/src/openrct2/entity/Litter.cpp b/src/openrct2/entity/Litter.cpp index 907a16961e..9ddecf9700 100644 --- a/src/openrct2/entity/Litter.cpp +++ b/src/openrct2/entity/Litter.cpp @@ -5,7 +5,7 @@ #include "../localisation/StringIds.h" #include "../world/Map.h" #include "EntityList.h" -#include "Sprite.h" +#include "EntityRegistry.h" static bool isLocationLitterable(const CoordsXYZ& mapPos) { diff --git a/src/openrct2/interface/InteractiveConsole.cpp b/src/openrct2/interface/InteractiveConsole.cpp index c68c19fdde..9156864e20 100644 --- a/src/openrct2/interface/InteractiveConsole.cpp +++ b/src/openrct2/interface/InteractiveConsole.cpp @@ -29,7 +29,7 @@ #include "../drawing/Drawing.h" #include "../drawing/Font.h" #include "../entity/EntityList.h" -#include "../entity/Sprite.h" +#include "../entity/EntityRegistry.h" #include "../interface/Chat.h" #include "../interface/Colour.h" #include "../interface/Window_internal.h" diff --git a/src/openrct2/libopenrct2.vcxproj b/src/openrct2/libopenrct2.vcxproj index 731425205f..766eeef138 100644 --- a/src/openrct2/libopenrct2.vcxproj +++ b/src/openrct2/libopenrct2.vcxproj @@ -210,12 +210,12 @@ + - @@ -665,12 +665,12 @@ + - diff --git a/src/openrct2/network/NetworkBase.cpp b/src/openrct2/network/NetworkBase.cpp index 0ef4f6105c..1c38c79f22 100644 --- a/src/openrct2/network/NetworkBase.cpp +++ b/src/openrct2/network/NetworkBase.cpp @@ -21,8 +21,8 @@ #include "../core/Guard.hpp" #include "../core/Json.hpp" #include "../entity/EntityList.h" +#include "../entity/EntityRegistry.h" #include "../entity/EntityTweener.h" -#include "../entity/Sprite.h" #include "../localisation/Formatting.h" #include "../platform/Platform2.h" #include "../scenario/Scenario.h" diff --git a/src/openrct2/paint/tile_element/Paint.Path.cpp b/src/openrct2/paint/tile_element/Paint.Path.cpp index c6b8edbeac..1a2b28b884 100644 --- a/src/openrct2/paint/tile_element/Paint.Path.cpp +++ b/src/openrct2/paint/tile_element/Paint.Path.cpp @@ -7,8 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "../Paint.h" - #include "../../Context.h" #include "../../Game.h" #include "../../config/Config.h" @@ -32,6 +30,7 @@ #include "../../world/Scenery.h" #include "../../world/Surface.h" #include "../../world/TileInspector.h" +#include "../Paint.h" #include "../Supports.h" #include "Paint.Surface.h" #include "Paint.TileElement.h" diff --git a/src/openrct2/peep/Guest.cpp b/src/openrct2/peep/Guest.cpp index c56096b8c0..fd004e97cf 100644 --- a/src/openrct2/peep/Guest.cpp +++ b/src/openrct2/peep/Guest.cpp @@ -17,9 +17,9 @@ #include "../core/Guard.hpp" #include "../core/Numerics.hpp" #include "../entity/Balloon.h" +#include "../entity/EntityRegistry.h" #include "../entity/MoneyEffect.h" #include "../entity/Particle.h" -#include "../entity/Sprite.h" #include "../interface/Window_internal.h" #include "../localisation/Localisation.h" #include "../management/Finance.h" diff --git a/src/openrct2/peep/Peep.cpp b/src/openrct2/peep/Peep.cpp index 6e94b70040..096d4a8a43 100644 --- a/src/openrct2/peep/Peep.cpp +++ b/src/openrct2/peep/Peep.cpp @@ -20,8 +20,8 @@ #include "../config/Config.h" #include "../core/Guard.hpp" #include "../entity/Balloon.h" +#include "../entity/EntityRegistry.h" #include "../entity/EntityTweener.h" -#include "../entity/Sprite.h" #include "../interface/Window.h" #include "../localisation/Localisation.h" #include "../management/Finance.h" diff --git a/src/openrct2/peep/Staff.cpp b/src/openrct2/peep/Staff.cpp index 688b8560a1..d4e3acca6e 100644 --- a/src/openrct2/peep/Staff.cpp +++ b/src/openrct2/peep/Staff.cpp @@ -16,7 +16,7 @@ #include "../actions/StaffSetOrdersAction.h" #include "../audio/audio.h" #include "../config/Config.h" -#include "../entity/Sprite.h" +#include "../entity/EntityRegistry.h" #include "../interface/Viewport.h" #include "../localisation/Date.h" #include "../localisation/Localisation.h" diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index 3d38fd92ca..ff8bee8b0d 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -26,11 +26,11 @@ #include "../entity/Balloon.h" #include "../entity/Duck.h" #include "../entity/EntityList.h" +#include "../entity/EntityRegistry.h" #include "../entity/Fountain.h" #include "../entity/Litter.h" #include "../entity/MoneyEffect.h" #include "../entity/Particle.h" -#include "../entity/Sprite.h" #include "../interface/Window.h" #include "../localisation/Date.h" #include "../localisation/Localisation.h" diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index ec6ace5485..c72d06fbe0 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -25,12 +25,12 @@ #include "../entity/Balloon.h" #include "../entity/Duck.h" #include "../entity/EntityList.h" +#include "../entity/EntityRegistry.h" #include "../entity/EntityTweener.h" #include "../entity/Fountain.h" #include "../entity/Litter.h" #include "../entity/MoneyEffect.h" #include "../entity/Particle.h" -#include "../entity/Sprite.h" #include "../interface/Viewport.h" #include "../localisation/Date.h" #include "../localisation/Localisation.h" diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index baccefafd5..a6f37a275e 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -25,7 +25,7 @@ #include "../core/FixedVector.h" #include "../core/Guard.hpp" #include "../core/Numerics.hpp" -#include "../entity/Sprite.h" +#include "../entity/EntityRegistry.h" #include "../interface/Window.h" #include "../localisation/Date.h" #include "../localisation/Localisation.h" diff --git a/src/openrct2/ride/RideConstruction.cpp b/src/openrct2/ride/RideConstruction.cpp index f4eee0f3ea..d327627ae5 100644 --- a/src/openrct2/ride/RideConstruction.cpp +++ b/src/openrct2/ride/RideConstruction.cpp @@ -17,7 +17,7 @@ #include "../common.h" #include "../entity/Entity.h" #include "../entity/EntityList.h" -#include "../entity/Sprite.h" +#include "../entity/EntityRegistry.h" #include "../interface/Window.h" #include "../localisation/Date.h" #include "../localisation/Localisation.h" diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp index 8ec18d6204..c717cfdc03 100644 --- a/src/openrct2/ride/Vehicle.cpp +++ b/src/openrct2/ride/Vehicle.cpp @@ -18,8 +18,8 @@ #include "../audio/audio.h" #include "../config/Config.h" #include "../core/Memory.hpp" +#include "../entity/EntityRegistry.h" #include "../entity/Particle.h" -#include "../entity/Sprite.h" #include "../interface/Viewport.h" #include "../localisation/Localisation.h" #include "../management/NewsItem.h" diff --git a/src/openrct2/ride/transport/SuspendedMonorail.cpp b/src/openrct2/ride/transport/SuspendedMonorail.cpp index 1f0f89b438..4b98dc6947 100644 --- a/src/openrct2/ride/transport/SuspendedMonorail.cpp +++ b/src/openrct2/ride/transport/SuspendedMonorail.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ #include "../../drawing/Drawing.h" -#include "../../entity/Sprite.h" +#include "../../entity/EntityRegistry.h" #include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" diff --git a/src/openrct2/scripting/bindings/entity/ScEntity.hpp b/src/openrct2/scripting/bindings/entity/ScEntity.hpp index 3a900aede6..b08067f26a 100644 --- a/src/openrct2/scripting/bindings/entity/ScEntity.hpp +++ b/src/openrct2/scripting/bindings/entity/ScEntity.hpp @@ -14,7 +14,7 @@ # include "../../../Context.h" # include "../../../common.h" # include "../../../entity/EntityList.h" -# include "../../../entity/Sprite.h" +# include "../../../entity/EntityRegistry.h" # include "../../../peep/Peep.h" # include "../../../util/Util.h" # include "../../Duktape.hpp" diff --git a/src/openrct2/scripting/bindings/world/ScTile.cpp b/src/openrct2/scripting/bindings/world/ScTile.cpp index 17344dba11..50b4c6a522 100644 --- a/src/openrct2/scripting/bindings/world/ScTile.cpp +++ b/src/openrct2/scripting/bindings/world/ScTile.cpp @@ -14,7 +14,7 @@ # include "../../../Context.h" # include "../../../common.h" # include "../../../core/Guard.hpp" -# include "../../../entity/Sprite.h" +# include "../../../entity/EntityRegistry.h" # include "../../../ride/Track.h" # include "../../../world/Footpath.h" # include "../../../world/Scenery.h" diff --git a/src/openrct2/scripting/bindings/world/ScTileElement.cpp b/src/openrct2/scripting/bindings/world/ScTileElement.cpp index 6033ef5d5e..bc19abc6d3 100644 --- a/src/openrct2/scripting/bindings/world/ScTileElement.cpp +++ b/src/openrct2/scripting/bindings/world/ScTileElement.cpp @@ -14,7 +14,7 @@ # include "../../../Context.h" # include "../../../common.h" # include "../../../core/Guard.hpp" -# include "../../../entity/Sprite.h" +# include "../../../entity/EntityRegistry.h" # include "../../../ride/Track.h" # include "../../../world/Footpath.h" # include "../../../world/Scenery.h" diff --git a/src/openrct2/scripting/bindings/world/ScTileElement.hpp b/src/openrct2/scripting/bindings/world/ScTileElement.hpp index 586103fa05..40661f0525 100644 --- a/src/openrct2/scripting/bindings/world/ScTileElement.hpp +++ b/src/openrct2/scripting/bindings/world/ScTileElement.hpp @@ -14,7 +14,7 @@ # include "../../../Context.h" # include "../../../common.h" # include "../../../core/Guard.hpp" -# include "../../../entity/Sprite.h" +# include "../../../entity/EntityRegistry.h" # include "../../../ride/Track.h" # include "../../../world/Footpath.h" # include "../../../world/Scenery.h" diff --git a/src/openrct2/world/Footpath.cpp b/src/openrct2/world/Footpath.cpp index 61fb01c0e6..b44a65c7cd 100644 --- a/src/openrct2/world/Footpath.cpp +++ b/src/openrct2/world/Footpath.cpp @@ -16,7 +16,7 @@ #include "../actions/LandSetRightsAction.h" #include "../core/Guard.hpp" #include "../entity/EntityList.h" -#include "../entity/Sprite.h" +#include "../entity/EntityRegistry.h" #include "../interface/Window_internal.h" #include "../localisation/Localisation.h" #include "../management/Finance.h" diff --git a/test/tests/PlayTests.cpp b/test/tests/PlayTests.cpp index ecbb48e9e9..f4a4a3230e 100644 --- a/test/tests/PlayTests.cpp +++ b/test/tests/PlayTests.cpp @@ -17,8 +17,8 @@ #include #include #include +#include #include -#include #include #include #include diff --git a/test/tests/S6ImportExportTests.cpp b/test/tests/S6ImportExportTests.cpp index ab259cfa15..3d81db9431 100644 --- a/test/tests/S6ImportExportTests.cpp +++ b/test/tests/S6ImportExportTests.cpp @@ -25,8 +25,8 @@ #include #include #include +#include #include -#include #include #include #include