From b3c17b215f76c7807749c5342eb1da9c9c324ea8 Mon Sep 17 00:00:00 2001 From: Ted John Date: Wed, 30 May 2018 19:45:43 +0100 Subject: [PATCH 1/5] Use single output folder for msbuild obj files This requires unique named source files within a project. --- src/openrct2-cli/openrct2-cli.vcxproj | 1 - src/openrct2-dll/openrct2-dll.vcxproj | 1 - src/openrct2-ui/libopenrct2ui.vcxproj | 1 - src/openrct2-win/openrct2-win.vcxproj | 1 - src/openrct2/drawing/{Sprite.cpp => Drawing.Sprite.cpp} | 0 src/openrct2/drawing/{String.cpp => Drawing.String.cpp} | 0 src/openrct2/interface/{Console.cpp => InteractiveConsole.cpp} | 0 src/openrct2/libopenrct2.vcxproj | 1 - src/openrct2/localisation/{Date.cpp => Localisation.Date.cpp} | 0 src/openrct2/paint/sprite/{Peep.cpp => Paint.Peep.cpp} | 0 src/openrct2/paint/sprite/{Sprite.cpp => Paint.Sprite.cpp} | 0 src/openrct2/paint/tile_element/{Banner.cpp => Paint.Banner.cpp} | 0 .../paint/tile_element/{Entrance.cpp => Paint.Entrance.cpp} | 0 .../tile_element/{LargeScenery.cpp => Paint.LargeScenery.cpp} | 0 src/openrct2/paint/tile_element/{Path.cpp => Paint.Path.cpp} | 0 .../tile_element/{SmallScenery.cpp => Paint.SmallScenery.cpp} | 0 .../paint/tile_element/{Surface.cpp => Paint.Surface.cpp} | 0 .../tile_element/{TileElement.cpp => Paint.TileElement.cpp} | 0 src/openrct2/paint/tile_element/{Fence.cpp => Paint.Wall.cpp} | 0 19 files changed, 5 deletions(-) rename src/openrct2/drawing/{Sprite.cpp => Drawing.Sprite.cpp} (100%) rename src/openrct2/drawing/{String.cpp => Drawing.String.cpp} (100%) rename src/openrct2/interface/{Console.cpp => InteractiveConsole.cpp} (100%) rename src/openrct2/localisation/{Date.cpp => Localisation.Date.cpp} (100%) rename src/openrct2/paint/sprite/{Peep.cpp => Paint.Peep.cpp} (100%) rename src/openrct2/paint/sprite/{Sprite.cpp => Paint.Sprite.cpp} (100%) rename src/openrct2/paint/tile_element/{Banner.cpp => Paint.Banner.cpp} (100%) rename src/openrct2/paint/tile_element/{Entrance.cpp => Paint.Entrance.cpp} (100%) rename src/openrct2/paint/tile_element/{LargeScenery.cpp => Paint.LargeScenery.cpp} (100%) rename src/openrct2/paint/tile_element/{Path.cpp => Paint.Path.cpp} (100%) rename src/openrct2/paint/tile_element/{SmallScenery.cpp => Paint.SmallScenery.cpp} (100%) rename src/openrct2/paint/tile_element/{Surface.cpp => Paint.Surface.cpp} (100%) rename src/openrct2/paint/tile_element/{TileElement.cpp => Paint.TileElement.cpp} (100%) rename src/openrct2/paint/tile_element/{Fence.cpp => Paint.Wall.cpp} (100%) diff --git a/src/openrct2-cli/openrct2-cli.vcxproj b/src/openrct2-cli/openrct2-cli.vcxproj index 5f153bce6e..9a76591370 100644 --- a/src/openrct2-cli/openrct2-cli.vcxproj +++ b/src/openrct2-cli/openrct2-cli.vcxproj @@ -36,7 +36,6 @@ - $(IntDir)\%(RelativeDir) $(OPENRCT2_CL_ADDITIONALOPTIONS) %(AdditionalOptions) diff --git a/src/openrct2-dll/openrct2-dll.vcxproj b/src/openrct2-dll/openrct2-dll.vcxproj index 9ba350c54f..5b00e1e85f 100644 --- a/src/openrct2-dll/openrct2-dll.vcxproj +++ b/src/openrct2-dll/openrct2-dll.vcxproj @@ -41,7 +41,6 @@ - $(IntDir)\%(RelativeDir) $(OPENRCT2_CL_ADDITIONALOPTIONS) %(AdditionalOptions) diff --git a/src/openrct2-ui/libopenrct2ui.vcxproj b/src/openrct2-ui/libopenrct2ui.vcxproj index 0d9b5d811a..ab79111952 100644 --- a/src/openrct2-ui/libopenrct2ui.vcxproj +++ b/src/openrct2-ui/libopenrct2ui.vcxproj @@ -45,7 +45,6 @@ - $(IntDir)\%(RelativeDir) $(OPENRCT2_CL_ADDITIONALOPTIONS) %(AdditionalOptions) diff --git a/src/openrct2-win/openrct2-win.vcxproj b/src/openrct2-win/openrct2-win.vcxproj index dcc0fade85..74b6e852ba 100644 --- a/src/openrct2-win/openrct2-win.vcxproj +++ b/src/openrct2-win/openrct2-win.vcxproj @@ -41,7 +41,6 @@ - $(IntDir)\%(RelativeDir) $(OPENRCT2_CL_ADDITIONALOPTIONS) %(AdditionalOptions) diff --git a/src/openrct2/drawing/Sprite.cpp b/src/openrct2/drawing/Drawing.Sprite.cpp similarity index 100% rename from src/openrct2/drawing/Sprite.cpp rename to src/openrct2/drawing/Drawing.Sprite.cpp diff --git a/src/openrct2/drawing/String.cpp b/src/openrct2/drawing/Drawing.String.cpp similarity index 100% rename from src/openrct2/drawing/String.cpp rename to src/openrct2/drawing/Drawing.String.cpp diff --git a/src/openrct2/interface/Console.cpp b/src/openrct2/interface/InteractiveConsole.cpp similarity index 100% rename from src/openrct2/interface/Console.cpp rename to src/openrct2/interface/InteractiveConsole.cpp diff --git a/src/openrct2/libopenrct2.vcxproj b/src/openrct2/libopenrct2.vcxproj index e53bc9f93c..3cc7869f28 100644 --- a/src/openrct2/libopenrct2.vcxproj +++ b/src/openrct2/libopenrct2.vcxproj @@ -38,7 +38,6 @@ - $(IntDir)\%(RelativeDir) $(OPENRCT2_CL_ADDITIONALOPTIONS) %(AdditionalOptions) diff --git a/src/openrct2/localisation/Date.cpp b/src/openrct2/localisation/Localisation.Date.cpp similarity index 100% rename from src/openrct2/localisation/Date.cpp rename to src/openrct2/localisation/Localisation.Date.cpp diff --git a/src/openrct2/paint/sprite/Peep.cpp b/src/openrct2/paint/sprite/Paint.Peep.cpp similarity index 100% rename from src/openrct2/paint/sprite/Peep.cpp rename to src/openrct2/paint/sprite/Paint.Peep.cpp diff --git a/src/openrct2/paint/sprite/Sprite.cpp b/src/openrct2/paint/sprite/Paint.Sprite.cpp similarity index 100% rename from src/openrct2/paint/sprite/Sprite.cpp rename to src/openrct2/paint/sprite/Paint.Sprite.cpp diff --git a/src/openrct2/paint/tile_element/Banner.cpp b/src/openrct2/paint/tile_element/Paint.Banner.cpp similarity index 100% rename from src/openrct2/paint/tile_element/Banner.cpp rename to src/openrct2/paint/tile_element/Paint.Banner.cpp diff --git a/src/openrct2/paint/tile_element/Entrance.cpp b/src/openrct2/paint/tile_element/Paint.Entrance.cpp similarity index 100% rename from src/openrct2/paint/tile_element/Entrance.cpp rename to src/openrct2/paint/tile_element/Paint.Entrance.cpp diff --git a/src/openrct2/paint/tile_element/LargeScenery.cpp b/src/openrct2/paint/tile_element/Paint.LargeScenery.cpp similarity index 100% rename from src/openrct2/paint/tile_element/LargeScenery.cpp rename to src/openrct2/paint/tile_element/Paint.LargeScenery.cpp diff --git a/src/openrct2/paint/tile_element/Path.cpp b/src/openrct2/paint/tile_element/Paint.Path.cpp similarity index 100% rename from src/openrct2/paint/tile_element/Path.cpp rename to src/openrct2/paint/tile_element/Paint.Path.cpp diff --git a/src/openrct2/paint/tile_element/SmallScenery.cpp b/src/openrct2/paint/tile_element/Paint.SmallScenery.cpp similarity index 100% rename from src/openrct2/paint/tile_element/SmallScenery.cpp rename to src/openrct2/paint/tile_element/Paint.SmallScenery.cpp diff --git a/src/openrct2/paint/tile_element/Surface.cpp b/src/openrct2/paint/tile_element/Paint.Surface.cpp similarity index 100% rename from src/openrct2/paint/tile_element/Surface.cpp rename to src/openrct2/paint/tile_element/Paint.Surface.cpp diff --git a/src/openrct2/paint/tile_element/TileElement.cpp b/src/openrct2/paint/tile_element/Paint.TileElement.cpp similarity index 100% rename from src/openrct2/paint/tile_element/TileElement.cpp rename to src/openrct2/paint/tile_element/Paint.TileElement.cpp diff --git a/src/openrct2/paint/tile_element/Fence.cpp b/src/openrct2/paint/tile_element/Paint.Wall.cpp similarity index 100% rename from src/openrct2/paint/tile_element/Fence.cpp rename to src/openrct2/paint/tile_element/Paint.Wall.cpp From 550d13414617885289aa3a2efce2631673ea4fa0 Mon Sep 17 00:00:00 2001 From: Ted John Date: Wed, 30 May 2018 19:48:36 +0100 Subject: [PATCH 2/5] Build libopenrct2 and libopenrct2ui simultaneously --- appveyor.yml | 1 + openrct2.sln | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index f83f5953df..70949febdc 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -18,6 +18,7 @@ platform: - x64 configuration: Release build: + parallel: true project: openrct2.proj test_script: - ps: msbuild openrct2.proj /t:Test /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" diff --git a/openrct2.sln b/openrct2.sln index 0165b51e77..a94b6c59eb 100644 --- a/openrct2.sln +++ b/openrct2.sln @@ -28,9 +28,6 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{480B577D-4E4A-4757-9A42-28A9AD33E6B0}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libopenrct2ui", "src\openrct2-ui\libopenrct2ui.vcxproj", "{8DD8AB7D-2EA6-44E3-8265-BAF08E832951}" - ProjectSection(ProjectDependencies) = postProject - {D24D94F6-2A74-480C-B512-629C306CE92F} = {D24D94F6-2A74-480C-B512-629C306CE92F} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openrct2-cli", "src\openrct2-cli\openrct2-cli.vcxproj", "{B6808F71-30B4-4499-8FF6-0B1C86391842}" ProjectSection(ProjectDependencies) = postProject From ce3b210e6b92676fd3d148caa2ab533552c864a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Wed, 30 May 2018 23:27:14 +0200 Subject: [PATCH 3/5] Fix testpaint build --- test/testpaint/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/testpaint/CMakeLists.txt b/test/testpaint/CMakeLists.txt index 8b5151d3b9..ddb8e43935 100644 --- a/test/testpaint/CMakeLists.txt +++ b/test/testpaint/CMakeLists.txt @@ -57,7 +57,7 @@ file(GLOB_RECURSE ORCT2_RIDE_SOURCES "${OPENRCT2_SRCPATH}/ride/*/*.cpp") file(GLOB_RECURSE ORCT2_RIDE_DEP_SOURCES "${OPENRCT2_SRCPATH}/Diagnostic.cpp" "${OPENRCT2_SRCPATH}/paint/PaintHelpers.cpp" - "${OPENRCT2_SRCPATH}/paint/tile_element/TileElement.cpp" + "${OPENRCT2_SRCPATH}/paint/tile_element/Paint.TileElement.cpp" "${OPENRCT2_SRCPATH}/ride/RideData.cpp" "${OPENRCT2_SRCPATH}/ride/TrackData.cpp" "${OPENRCT2_SRCPATH}/ride/TrackDataOld.cpp" From 92f6ac73330e949080b0b316e913ef785d9dae9d Mon Sep 17 00:00:00 2001 From: Ted John Date: Thu, 31 May 2018 23:16:53 +0100 Subject: [PATCH 4/5] Rename header files to match renamed source files --- src/openrct2-ui/TextComposition.cpp | 2 +- src/openrct2-ui/UiContext.cpp | 2 +- src/openrct2-ui/input/Input.cpp | 2 +- src/openrct2-ui/input/MouseInput.cpp | 2 +- src/openrct2-ui/interface/InGameConsole.h | 2 +- src/openrct2-ui/windows/DebugPaint.cpp | 2 +- src/openrct2-ui/windows/TopToolbar.cpp | 2 +- src/openrct2/Context.cpp | 2 +- src/openrct2/interface/InteractiveConsole.cpp | 2 +- src/openrct2/interface/{Console.h => InteractiveConsole.h} | 0 src/openrct2/interface/StdInOutConsole.cpp | 2 +- src/openrct2/network/Twitch.cpp | 2 +- src/openrct2/paint/Paint.cpp | 4 ++-- src/openrct2/paint/Painter.cpp | 2 +- src/openrct2/paint/Supports.cpp | 2 +- src/openrct2/paint/VirtualFloor.cpp | 2 +- src/openrct2/paint/sprite/{Litter.cpp => Paint.Litter.cpp} | 2 +- src/openrct2/paint/sprite/{Misc.cpp => Paint.Misc.cpp} | 2 +- src/openrct2/paint/sprite/Paint.Peep.cpp | 2 +- src/openrct2/paint/sprite/Paint.Sprite.cpp | 2 +- src/openrct2/paint/sprite/{Sprite.h => Paint.Sprite.h} | 0 src/openrct2/paint/tile_element/Paint.Banner.cpp | 2 +- src/openrct2/paint/tile_element/Paint.Entrance.cpp | 2 +- src/openrct2/paint/tile_element/Paint.LargeScenery.cpp | 2 +- src/openrct2/paint/tile_element/Paint.Path.cpp | 4 ++-- src/openrct2/paint/tile_element/Paint.SmallScenery.cpp | 2 +- src/openrct2/paint/tile_element/Paint.Surface.cpp | 4 ++-- .../paint/tile_element/{Surface.h => Paint.Surface.h} | 0 src/openrct2/paint/tile_element/Paint.TileElement.cpp | 4 ++-- .../paint/tile_element/{TileElement.h => Paint.TileElement.h} | 0 src/openrct2/paint/tile_element/Paint.Wall.cpp | 2 +- src/openrct2/peep/Staff.cpp | 2 +- src/openrct2/ride/TrackPaint.cpp | 2 +- src/openrct2/ride/TrackPaint.h | 2 +- src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp | 2 +- src/openrct2/ride/coaster/BobsleighCoaster.cpp | 2 +- src/openrct2/ride/coaster/BolligerMabillardTrack.cpp | 2 +- src/openrct2/ride/coaster/CompactInvertedCoaster.cpp | 2 +- src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp | 2 +- src/openrct2/ride/coaster/FlyingRollerCoaster.cpp | 2 +- src/openrct2/ride/coaster/GigaCoaster.cpp | 2 +- src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp | 2 +- src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp | 2 +- src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp | 2 +- src/openrct2/ride/coaster/InvertedRollerCoaster.cpp | 2 +- src/openrct2/ride/coaster/JuniorRollerCoaster.h | 2 +- src/openrct2/ride/coaster/LayDownRollerCoaster.cpp | 2 +- src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp | 2 +- src/openrct2/ride/coaster/LoopingRollerCoaster.cpp | 2 +- src/openrct2/ride/coaster/MineRide.cpp | 2 +- src/openrct2/ride/coaster/MineTrainCoaster.cpp | 2 +- src/openrct2/ride/coaster/MiniRollerCoaster.cpp | 2 +- src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp | 2 +- src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp | 2 +- src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp | 2 +- src/openrct2/ride/coaster/ReverserRollerCoaster.cpp | 2 +- src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp | 2 +- src/openrct2/ride/coaster/StandUpRollerCoaster.cpp | 2 +- src/openrct2/ride/coaster/Steeplechase.cpp | 2 +- src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp | 2 +- src/openrct2/ride/coaster/TwisterRollerCoaster.cpp | 2 +- src/openrct2/ride/coaster/WildMouse.cpp | 2 +- src/openrct2/ride/coaster/WoodenRollerCoaster.cpp | 2 +- src/openrct2/ride/coaster/WoodenWildMouse.cpp | 2 +- src/openrct2/ride/gentle/Maze.cpp | 2 +- src/openrct2/ride/transport/SuspendedMonorail.cpp | 2 +- src/openrct2/world/Particle.cpp | 2 +- test/testpaint/Compat.cpp | 2 +- test/testpaint/SegmentSupportHeightCall.cpp | 2 +- test/testpaint/TestPaint.hpp | 2 +- test/testpaint/TestTrack.cpp | 2 +- 71 files changed, 71 insertions(+), 71 deletions(-) rename src/openrct2/interface/{Console.h => InteractiveConsole.h} (100%) rename src/openrct2/paint/sprite/{Litter.cpp => Paint.Litter.cpp} (99%) rename src/openrct2/paint/sprite/{Misc.cpp => Paint.Misc.cpp} (99%) rename src/openrct2/paint/sprite/{Sprite.h => Paint.Sprite.h} (100%) rename src/openrct2/paint/tile_element/{Surface.h => Paint.Surface.h} (100%) rename src/openrct2/paint/tile_element/{TileElement.h => Paint.TileElement.h} (100%) diff --git a/src/openrct2-ui/TextComposition.cpp b/src/openrct2-ui/TextComposition.cpp index d6619d495f..32d6f62ad3 100644 --- a/src/openrct2-ui/TextComposition.cpp +++ b/src/openrct2-ui/TextComposition.cpp @@ -21,7 +21,7 @@ #include #include "TextComposition.h" -#include +#include #include #include #include "interface/InGameConsole.h" diff --git a/src/openrct2-ui/UiContext.cpp b/src/openrct2-ui/UiContext.cpp index da87bb3562..7b27e1f882 100644 --- a/src/openrct2-ui/UiContext.cpp +++ b/src/openrct2-ui/UiContext.cpp @@ -42,7 +42,7 @@ #include "WindowManager.h" #include -#include +#include #include #include "interface/InGameConsole.h" diff --git a/src/openrct2-ui/input/Input.cpp b/src/openrct2-ui/input/Input.cpp index fb2e666bb6..7d772df583 100644 --- a/src/openrct2-ui/input/Input.cpp +++ b/src/openrct2-ui/input/Input.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include "../interface/InGameConsole.h" diff --git a/src/openrct2-ui/input/MouseInput.cpp b/src/openrct2-ui/input/MouseInput.cpp index b8aa7ff935..2a05f0c1a8 100644 --- a/src/openrct2-ui/input/MouseInput.cpp +++ b/src/openrct2-ui/input/MouseInput.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/interface/InGameConsole.h b/src/openrct2-ui/interface/InGameConsole.h index 5e1da1a1be..2952e7e237 100644 --- a/src/openrct2-ui/interface/InGameConsole.h +++ b/src/openrct2-ui/interface/InGameConsole.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace OpenRCT2::Ui { diff --git a/src/openrct2-ui/windows/DebugPaint.cpp b/src/openrct2-ui/windows/DebugPaint.cpp index caaf6edeaa..0434b735f2 100644 --- a/src/openrct2-ui/windows/DebugPaint.cpp +++ b/src/openrct2-ui/windows/DebugPaint.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include diff --git a/src/openrct2-ui/windows/TopToolbar.cpp b/src/openrct2-ui/windows/TopToolbar.cpp index ae829652b6..20696bff6f 100644 --- a/src/openrct2-ui/windows/TopToolbar.cpp +++ b/src/openrct2-ui/windows/TopToolbar.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2/Context.cpp b/src/openrct2/Context.cpp index 947dcf7039..b987af310c 100644 --- a/src/openrct2/Context.cpp +++ b/src/openrct2/Context.cpp @@ -63,7 +63,7 @@ #include "Game.h" #include "Input.h" #include "interface/Chat.h" -#include "interface/Console.h" +#include "interface/InteractiveConsole.h" #include "interface/themes.h" #include "interface/Viewport.h" #include "Intro.h" diff --git a/src/openrct2/interface/InteractiveConsole.cpp b/src/openrct2/interface/InteractiveConsole.cpp index 822608d286..b03abc477a 100644 --- a/src/openrct2/interface/InteractiveConsole.cpp +++ b/src/openrct2/interface/InteractiveConsole.cpp @@ -52,7 +52,7 @@ #include "../world/Park.h" #include "../world/Scenery.h" #include "../world/Sprite.h" -#include "Console.h" +#include "InteractiveConsole.h" #include "Viewport.h" #ifndef NO_TTF diff --git a/src/openrct2/interface/Console.h b/src/openrct2/interface/InteractiveConsole.h similarity index 100% rename from src/openrct2/interface/Console.h rename to src/openrct2/interface/InteractiveConsole.h diff --git a/src/openrct2/interface/StdInOutConsole.cpp b/src/openrct2/interface/StdInOutConsole.cpp index b19ef5dca2..9e53fb8a25 100644 --- a/src/openrct2/interface/StdInOutConsole.cpp +++ b/src/openrct2/interface/StdInOutConsole.cpp @@ -1,7 +1,7 @@ #include "../thirdparty/linenoise.hpp" #include "../OpenRCT2.h" #include "../platform/Platform2.h" -#include "Console.h" +#include "InteractiveConsole.h" void StdInOutConsole::Start() { diff --git a/src/openrct2/network/Twitch.cpp b/src/openrct2/network/Twitch.cpp index 63b186d02a..05a8ad1b78 100644 --- a/src/openrct2/network/Twitch.cpp +++ b/src/openrct2/network/Twitch.cpp @@ -35,7 +35,7 @@ #include "../config/Config.h" #include "../drawing/Drawing.h" #include "../Game.h" -#include "../interface/Console.h" +#include "../interface/InteractiveConsole.h" #include "../localisation/Localisation.h" #include "../management/NewsItem.h" #include "../peep/Peep.h" diff --git a/src/openrct2/paint/Paint.cpp b/src/openrct2/paint/Paint.cpp index 060827ab57..34391793ad 100644 --- a/src/openrct2/paint/Paint.cpp +++ b/src/openrct2/paint/Paint.cpp @@ -22,8 +22,8 @@ #include "../localisation/Localisation.h" #include "../localisation/LocalisationService.h" #include "Paint.h" -#include "sprite/Sprite.h" -#include "tile_element/TileElement.h" +#include "sprite/Paint.Sprite.h" +#include "tile_element/Paint.TileElement.h" // Globals for paint clipping uint8 gClipHeight = 128; // Default to middle value diff --git a/src/openrct2/paint/Painter.cpp b/src/openrct2/paint/Painter.cpp index 550debda9c..d4c48bc764 100644 --- a/src/openrct2/paint/Painter.cpp +++ b/src/openrct2/paint/Painter.cpp @@ -24,7 +24,7 @@ #include "../drawing/Drawing.h" #include "../Game.h" #include "../interface/Chat.h" -#include "../interface/Console.h" +#include "../interface/InteractiveConsole.h" #include "../Intro.h" #include "../localisation/Language.h" #include "../localisation/FormatCodes.h" diff --git a/src/openrct2/paint/Supports.cpp b/src/openrct2/paint/Supports.cpp index c281ba5d25..e9e9420c49 100644 --- a/src/openrct2/paint/Supports.cpp +++ b/src/openrct2/paint/Supports.cpp @@ -18,7 +18,7 @@ #include "../world/Surface.h" #include "Paint.h" #include "Supports.h" -#include "tile_element/TileElement.h" +#include "tile_element/Paint.TileElement.h" /** rct2: 0x0097AF20, 0x0097AF21 */ // clang-format off diff --git a/src/openrct2/paint/VirtualFloor.cpp b/src/openrct2/paint/VirtualFloor.cpp index 0391dde644..72519f0587 100644 --- a/src/openrct2/paint/VirtualFloor.cpp +++ b/src/openrct2/paint/VirtualFloor.cpp @@ -21,7 +21,7 @@ #include "../sprites.h" #include "../world/Map.h" #include "Paint.h" -#include "tile_element/TileElement.h" +#include "tile_element/Paint.TileElement.h" #include "VirtualFloor.h" #include #include diff --git a/src/openrct2/paint/sprite/Litter.cpp b/src/openrct2/paint/sprite/Paint.Litter.cpp similarity index 99% rename from src/openrct2/paint/sprite/Litter.cpp rename to src/openrct2/paint/sprite/Paint.Litter.cpp index 24a184c7bf..2dbe087513 100644 --- a/src/openrct2/paint/sprite/Litter.cpp +++ b/src/openrct2/paint/sprite/Paint.Litter.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "Sprite.h" +#include "Paint.Sprite.h" #include "../../world/Sprite.h" #include "../../interface/Viewport.h" #include "../Paint.h" diff --git a/src/openrct2/paint/sprite/Misc.cpp b/src/openrct2/paint/sprite/Paint.Misc.cpp similarity index 99% rename from src/openrct2/paint/sprite/Misc.cpp rename to src/openrct2/paint/sprite/Paint.Misc.cpp index 6629e3b31d..912658cc09 100644 --- a/src/openrct2/paint/sprite/Misc.cpp +++ b/src/openrct2/paint/sprite/Paint.Misc.cpp @@ -17,7 +17,7 @@ #include "../../world/Sprite.h" #include "../../drawing/Drawing.h" #include "../../interface/Viewport.h" -#include "Sprite.h" +#include "Paint.Sprite.h" #include "../Paint.h" #include "../../localisation/StringIds.h" diff --git a/src/openrct2/paint/sprite/Paint.Peep.cpp b/src/openrct2/paint/sprite/Paint.Peep.cpp index 04ee435b08..b4ad8d7427 100644 --- a/src/openrct2/paint/sprite/Paint.Peep.cpp +++ b/src/openrct2/paint/sprite/Paint.Peep.cpp @@ -17,7 +17,7 @@ #include "../../config/Config.h" #include "../../drawing/LightFX.h" #include "../../interface/Viewport.h" -#include "Sprite.h" +#include "Paint.Sprite.h" #include "../../peep/Peep.h" #include "../../world/Sprite.h" #include "../Paint.h" diff --git a/src/openrct2/paint/sprite/Paint.Sprite.cpp b/src/openrct2/paint/sprite/Paint.Sprite.cpp index 3d52f47b94..9b8653d138 100644 --- a/src/openrct2/paint/sprite/Paint.Sprite.cpp +++ b/src/openrct2/paint/sprite/Paint.Sprite.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "Sprite.h" +#include "Paint.Sprite.h" #include "../Paint.h" #include "../../drawing/Drawing.h" #include "../../world/Sprite.h" diff --git a/src/openrct2/paint/sprite/Sprite.h b/src/openrct2/paint/sprite/Paint.Sprite.h similarity index 100% rename from src/openrct2/paint/sprite/Sprite.h rename to src/openrct2/paint/sprite/Paint.Sprite.h diff --git a/src/openrct2/paint/tile_element/Paint.Banner.cpp b/src/openrct2/paint/tile_element/Paint.Banner.cpp index b28ad565b1..27dfbb950f 100644 --- a/src/openrct2/paint/tile_element/Paint.Banner.cpp +++ b/src/openrct2/paint/tile_element/Paint.Banner.cpp @@ -20,7 +20,7 @@ #include "../../interface/Viewport.h" #include "../../localisation/Localisation.h" #include "../../ride/TrackDesign.h" -#include "TileElement.h" +#include "Paint.TileElement.h" #include "../../world/Banner.h" #include "../../world/Scenery.h" diff --git a/src/openrct2/paint/tile_element/Paint.Entrance.cpp b/src/openrct2/paint/tile_element/Paint.Entrance.cpp index 0463549141..9ce79d3e33 100644 --- a/src/openrct2/paint/tile_element/Paint.Entrance.cpp +++ b/src/openrct2/paint/tile_element/Paint.Entrance.cpp @@ -25,7 +25,7 @@ #include "../../world/Park.h" #include "../Paint.h" #include "../Supports.h" -#include "TileElement.h" +#include "Paint.TileElement.h" #include "../../drawing/LightFX.h" static uint32 _unk9E32BC; diff --git a/src/openrct2/paint/tile_element/Paint.LargeScenery.cpp b/src/openrct2/paint/tile_element/Paint.LargeScenery.cpp index c8f35823a5..99e70c649e 100644 --- a/src/openrct2/paint/tile_element/Paint.LargeScenery.cpp +++ b/src/openrct2/paint/tile_element/Paint.LargeScenery.cpp @@ -28,7 +28,7 @@ #include "../../world/Scenery.h" #include "../Paint.h" #include "../Supports.h" -#include "TileElement.h" +#include "Paint.TileElement.h" // 6B8172: static void large_scenery_paint_supports( diff --git a/src/openrct2/paint/tile_element/Paint.Path.cpp b/src/openrct2/paint/tile_element/Paint.Path.cpp index 58a388b11d..960b30b358 100644 --- a/src/openrct2/paint/tile_element/Paint.Path.cpp +++ b/src/openrct2/paint/tile_element/Paint.Path.cpp @@ -29,8 +29,8 @@ #include "../../world/Surface.h" #include "../Paint.h" #include "../Supports.h" -#include "TileElement.h" -#include "Surface.h" +#include "Paint.TileElement.h" +#include "Paint.Surface.h" #include "../../world/Map.h" #include "../../drawing/LightFX.h" diff --git a/src/openrct2/paint/tile_element/Paint.SmallScenery.cpp b/src/openrct2/paint/tile_element/Paint.SmallScenery.cpp index 9ee87e22c4..dfb497a247 100644 --- a/src/openrct2/paint/tile_element/Paint.SmallScenery.cpp +++ b/src/openrct2/paint/tile_element/Paint.SmallScenery.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "TileElement.h" +#include "Paint.TileElement.h" #include "../../config/Config.h" #include "../../Game.h" #include "../../interface/Viewport.h" diff --git a/src/openrct2/paint/tile_element/Paint.Surface.cpp b/src/openrct2/paint/tile_element/Paint.Surface.cpp index bd453393bc..33149caa75 100644 --- a/src/openrct2/paint/tile_element/Paint.Surface.cpp +++ b/src/openrct2/paint/tile_element/Paint.Surface.cpp @@ -31,8 +31,8 @@ #include "../../sprites.h" #include "../../world/Sprite.h" #include "../../world/Surface.h" -#include "Surface.h" -#include "TileElement.h" +#include "Paint.Surface.h" +#include "Paint.TileElement.h" // clang-format off static constexpr const uint8 byte_97B444[] = diff --git a/src/openrct2/paint/tile_element/Surface.h b/src/openrct2/paint/tile_element/Paint.Surface.h similarity index 100% rename from src/openrct2/paint/tile_element/Surface.h rename to src/openrct2/paint/tile_element/Paint.Surface.h diff --git a/src/openrct2/paint/tile_element/Paint.TileElement.cpp b/src/openrct2/paint/tile_element/Paint.TileElement.cpp index ebc16551f1..328228ec89 100644 --- a/src/openrct2/paint/tile_element/Paint.TileElement.cpp +++ b/src/openrct2/paint/tile_element/Paint.TileElement.cpp @@ -34,8 +34,8 @@ #include "../Paint.h" #include "../Supports.h" #include "../VirtualFloor.h" -#include "Surface.h" -#include "TileElement.h" +#include "Paint.Surface.h" +#include "Paint.TileElement.h" #ifdef __TESTPAINT__ uint16 testPaintVerticalTunnelHeight; diff --git a/src/openrct2/paint/tile_element/TileElement.h b/src/openrct2/paint/tile_element/Paint.TileElement.h similarity index 100% rename from src/openrct2/paint/tile_element/TileElement.h rename to src/openrct2/paint/tile_element/Paint.TileElement.h diff --git a/src/openrct2/paint/tile_element/Paint.Wall.cpp b/src/openrct2/paint/tile_element/Paint.Wall.cpp index efb9e2bf46..b2dec2aed2 100644 --- a/src/openrct2/paint/tile_element/Paint.Wall.cpp +++ b/src/openrct2/paint/tile_element/Paint.Wall.cpp @@ -28,7 +28,7 @@ #include "../../world/Scenery.h" #include "../../world/Wall.h" #include "../Paint.h" -#include "TileElement.h" +#include "Paint.TileElement.h" static constexpr const uint8 byte_9A406C[] = { 2, 2, 22, 26, 30, 34, 34, 34, 34, 34, 30, 26, 22, 2, 6, 2, diff --git a/src/openrct2/peep/Staff.cpp b/src/openrct2/peep/Staff.cpp index 62fc41184e..19f15be282 100644 --- a/src/openrct2/peep/Staff.cpp +++ b/src/openrct2/peep/Staff.cpp @@ -31,7 +31,7 @@ #include "../ride/Station.h" #include "../ride/RideData.h" #include "../ride/Track.h" -#include "../paint/tile_element/TileElement.h" +#include "../paint/tile_element/Paint.TileElement.h" #include "../scenario/Scenario.h" #include "../util/Util.h" #include "../world/Entrance.h" diff --git a/src/openrct2/ride/TrackPaint.cpp b/src/openrct2/ride/TrackPaint.cpp index 8dc5953a03..154a5e3303 100644 --- a/src/openrct2/ride/TrackPaint.cpp +++ b/src/openrct2/ride/TrackPaint.cpp @@ -21,7 +21,7 @@ #include "../localisation/Localisation.h" #include "../paint/Paint.h" #include "../paint/Supports.h" -#include "../paint/tile_element/TileElement.h" +#include "../paint/tile_element/Paint.TileElement.h" #include "../scenario/Scenario.h" #include "../sprites.h" #include "../world/Map.h" diff --git a/src/openrct2/ride/TrackPaint.h b/src/openrct2/ride/TrackPaint.h index 3a0406060c..89105462ba 100644 --- a/src/openrct2/ride/TrackPaint.h +++ b/src/openrct2/ride/TrackPaint.h @@ -19,7 +19,7 @@ #include "RideData.h" #include "../common.h" -#include "../paint/tile_element/TileElement.h" +#include "../paint/tile_element/Paint.TileElement.h" #include "../paint/Paint.h" #include "../world/Map.h" diff --git a/src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp b/src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp index 68b00454a6..a3225ca854 100644 --- a/src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp +++ b/src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp @@ -16,7 +16,7 @@ #include "../../drawing/Drawing.h" #include "../../interface/Viewport.h" -#include "../../paint/tile_element/TileElement.h" +#include "../../paint/tile_element/Paint.TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" diff --git a/src/openrct2/ride/coaster/BobsleighCoaster.cpp b/src/openrct2/ride/coaster/BobsleighCoaster.cpp index e1ce8f131f..a0819c262d 100644 --- a/src/openrct2/ride/coaster/BobsleighCoaster.cpp +++ b/src/openrct2/ride/coaster/BobsleighCoaster.cpp @@ -16,7 +16,7 @@ #include "../../drawing/Drawing.h" #include "../../interface/Viewport.h" -#include "../../paint/tile_element/TileElement.h" +#include "../../paint/tile_element/Paint.TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" diff --git a/src/openrct2/ride/coaster/BolligerMabillardTrack.cpp b/src/openrct2/ride/coaster/BolligerMabillardTrack.cpp index bb938b2e67..4a5f350852 100644 --- a/src/openrct2/ride/coaster/BolligerMabillardTrack.cpp +++ b/src/openrct2/ride/coaster/BolligerMabillardTrack.cpp @@ -16,7 +16,7 @@ #include "../../drawing/Drawing.h" #include "../../interface/Viewport.h" -#include "../../paint/tile_element/TileElement.h" +#include "../../paint/tile_element/Paint.TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" diff --git a/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp b/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp index 4fdb9d4d68..556effb97f 100644 --- a/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp +++ b/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp @@ -16,7 +16,7 @@ #include "../../drawing/Drawing.h" #include "../../interface/Viewport.h" -#include "../../paint/tile_element/TileElement.h" +#include "../../paint/tile_element/Paint.TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" diff --git a/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp b/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp index ebbde9e621..ad4a67b103 100644 --- a/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp @@ -16,7 +16,7 @@ #include "../../drawing/Drawing.h" #include "../../interface/Viewport.h" -#include "../../paint/tile_element/TileElement.h" +#include "../../paint/tile_element/Paint.TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" diff --git a/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp b/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp index b052f310d2..4710347375 100644 --- a/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp @@ -16,7 +16,7 @@ #include "../../drawing/Drawing.h" #include "../../interface/Viewport.h" -#include "../../paint/tile_element/TileElement.h" +#include "../../paint/tile_element/Paint.TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" diff --git a/src/openrct2/ride/coaster/GigaCoaster.cpp b/src/openrct2/ride/coaster/GigaCoaster.cpp index 63fed5fee4..7cc424f5ab 100644 --- a/src/openrct2/ride/coaster/GigaCoaster.cpp +++ b/src/openrct2/ride/coaster/GigaCoaster.cpp @@ -16,7 +16,7 @@ #include "../../drawing/Drawing.h" #include "../../interface/Viewport.h" -#include "../../paint/tile_element/TileElement.h" +#include "../../paint/tile_element/Paint.TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" diff --git a/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp b/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp index 1480c338f7..1309f73a23 100644 --- a/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp +++ b/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp @@ -16,7 +16,7 @@ #include "../../drawing/Drawing.h" #include "../../interface/Viewport.h" -#include "../../paint/tile_element/TileElement.h" +#include "../../paint/tile_element/Paint.TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" diff --git a/src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp b/src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp index 3bd09973fc..5c7905894e 100644 --- a/src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp +++ b/src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp @@ -16,7 +16,7 @@ #include "../../drawing/Drawing.h" #include "../../interface/Viewport.h" -#include "../../paint/tile_element/TileElement.h" +#include "../../paint/tile_element/Paint.TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" diff --git a/src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp b/src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp index 1e9a58b667..96b4dfbf8e 100644 --- a/src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp +++ b/src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp @@ -16,7 +16,7 @@ #include "../../drawing/Drawing.h" #include "../../interface/Viewport.h" -#include "../../paint/tile_element/TileElement.h" +#include "../../paint/tile_element/Paint.TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" diff --git a/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp b/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp index 1a940a778b..2caa96c83a 100644 --- a/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp @@ -16,7 +16,7 @@ #include "../../drawing/Drawing.h" #include "../../interface/Viewport.h" -#include "../../paint/tile_element/TileElement.h" +#include "../../paint/tile_element/Paint.TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" diff --git a/src/openrct2/ride/coaster/JuniorRollerCoaster.h b/src/openrct2/ride/coaster/JuniorRollerCoaster.h index 163f731849..fa92bdb99a 100644 --- a/src/openrct2/ride/coaster/JuniorRollerCoaster.h +++ b/src/openrct2/ride/coaster/JuniorRollerCoaster.h @@ -18,7 +18,7 @@ #define _JUNIOR_ROLLER_COASTER_H #include "../../common.h" -#include "../../paint/tile_element/TileElement.h" +#include "../../paint/tile_element/Paint.TileElement.h" enum JUNIOR_RC_CHAINTYPE { diff --git a/src/openrct2/ride/coaster/LayDownRollerCoaster.cpp b/src/openrct2/ride/coaster/LayDownRollerCoaster.cpp index 15c37f1fa7..32a226d562 100644 --- a/src/openrct2/ride/coaster/LayDownRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/LayDownRollerCoaster.cpp @@ -16,7 +16,7 @@ #include "../../drawing/Drawing.h" #include "../../interface/Viewport.h" -#include "../../paint/tile_element/TileElement.h" +#include "../../paint/tile_element/Paint.TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" diff --git a/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp b/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp index 41bd5720b2..8fa2c6ae30 100644 --- a/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp @@ -16,7 +16,7 @@ #include "../../drawing/Drawing.h" #include "../../interface/Viewport.h" -#include "../../paint/tile_element/TileElement.h" +#include "../../paint/tile_element/Paint.TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" diff --git a/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp b/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp index 3277114de2..c4aa18418a 100644 --- a/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp @@ -16,7 +16,7 @@ #include "../../drawing/Drawing.h" #include "../../interface/Viewport.h" -#include "../../paint/tile_element/TileElement.h" +#include "../../paint/tile_element/Paint.TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" diff --git a/src/openrct2/ride/coaster/MineRide.cpp b/src/openrct2/ride/coaster/MineRide.cpp index 35f7bd2af4..8d52409660 100644 --- a/src/openrct2/ride/coaster/MineRide.cpp +++ b/src/openrct2/ride/coaster/MineRide.cpp @@ -16,7 +16,7 @@ #include "../../drawing/Drawing.h" #include "../../interface/Viewport.h" -#include "../../paint/tile_element/TileElement.h" +#include "../../paint/tile_element/Paint.TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" diff --git a/src/openrct2/ride/coaster/MineTrainCoaster.cpp b/src/openrct2/ride/coaster/MineTrainCoaster.cpp index d414d70676..980893cf4b 100644 --- a/src/openrct2/ride/coaster/MineTrainCoaster.cpp +++ b/src/openrct2/ride/coaster/MineTrainCoaster.cpp @@ -16,7 +16,7 @@ #include "../../drawing/Drawing.h" #include "../../interface/Viewport.h" -#include "../../paint/tile_element/TileElement.h" +#include "../../paint/tile_element/Paint.TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" diff --git a/src/openrct2/ride/coaster/MiniRollerCoaster.cpp b/src/openrct2/ride/coaster/MiniRollerCoaster.cpp index a4fb252610..fb64b44c23 100644 --- a/src/openrct2/ride/coaster/MiniRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/MiniRollerCoaster.cpp @@ -16,7 +16,7 @@ #include "../../drawing/Drawing.h" #include "../../interface/Viewport.h" -#include "../../paint/tile_element/TileElement.h" +#include "../../paint/tile_element/Paint.TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" diff --git a/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp b/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp index 2d834ab999..2031a51226 100644 --- a/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp +++ b/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp @@ -16,7 +16,7 @@ #include "../../drawing/Drawing.h" #include "../../interface/Viewport.h" -#include "../../paint/tile_element/TileElement.h" +#include "../../paint/tile_element/Paint.TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" diff --git a/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp b/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp index 3cc5e97d57..eb87169154 100644 --- a/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp @@ -16,7 +16,7 @@ #include "../../drawing/Drawing.h" #include "../../interface/Viewport.h" -#include "../../paint/tile_element/TileElement.h" +#include "../../paint/tile_element/Paint.TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" diff --git a/src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp b/src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp index b7117a5b02..9c28fa9336 100644 --- a/src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp +++ b/src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp @@ -16,7 +16,7 @@ #include "../../drawing/Drawing.h" #include "../../interface/Viewport.h" -#include "../../paint/tile_element/TileElement.h" +#include "../../paint/tile_element/Paint.TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" diff --git a/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp b/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp index b1d4108985..82d00bc4cd 100644 --- a/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp @@ -16,7 +16,7 @@ #include "../../drawing/Drawing.h" #include "../../interface/Viewport.h" -#include "../../paint/tile_element/TileElement.h" +#include "../../paint/tile_element/Paint.TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" diff --git a/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp b/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp index a7180e723b..2a26e1651a 100644 --- a/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp @@ -16,7 +16,7 @@ #include "../../drawing/Drawing.h" #include "../../interface/Viewport.h" -#include "../../paint/tile_element/TileElement.h" +#include "../../paint/tile_element/Paint.TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" diff --git a/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp b/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp index 2769dc0bbf..7135538602 100644 --- a/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp @@ -16,7 +16,7 @@ #include "../../drawing/Drawing.h" #include "../../interface/Viewport.h" -#include "../../paint/tile_element/TileElement.h" +#include "../../paint/tile_element/Paint.TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" diff --git a/src/openrct2/ride/coaster/Steeplechase.cpp b/src/openrct2/ride/coaster/Steeplechase.cpp index 14265b42e8..08f944955d 100644 --- a/src/openrct2/ride/coaster/Steeplechase.cpp +++ b/src/openrct2/ride/coaster/Steeplechase.cpp @@ -16,7 +16,7 @@ #include "../../drawing/Drawing.h" #include "../../interface/Viewport.h" -#include "../../paint/tile_element/TileElement.h" +#include "../../paint/tile_element/Paint.TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" diff --git a/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp b/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp index 7037b7219e..2a70ac2e82 100644 --- a/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp +++ b/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp @@ -16,7 +16,7 @@ #include "../../drawing/Drawing.h" #include "../../interface/Viewport.h" -#include "../../paint/tile_element/TileElement.h" +#include "../../paint/tile_element/Paint.TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" diff --git a/src/openrct2/ride/coaster/TwisterRollerCoaster.cpp b/src/openrct2/ride/coaster/TwisterRollerCoaster.cpp index dbeafb461e..898077e87f 100644 --- a/src/openrct2/ride/coaster/TwisterRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/TwisterRollerCoaster.cpp @@ -16,7 +16,7 @@ #include "../../drawing/Drawing.h" #include "../../interface/Viewport.h" -#include "../../paint/tile_element/TileElement.h" +#include "../../paint/tile_element/Paint.TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" diff --git a/src/openrct2/ride/coaster/WildMouse.cpp b/src/openrct2/ride/coaster/WildMouse.cpp index d924012d34..1d3c2a040f 100644 --- a/src/openrct2/ride/coaster/WildMouse.cpp +++ b/src/openrct2/ride/coaster/WildMouse.cpp @@ -16,7 +16,7 @@ #include "../../drawing/Drawing.h" #include "../../interface/Viewport.h" -#include "../../paint/tile_element/TileElement.h" +#include "../../paint/tile_element/Paint.TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" diff --git a/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp b/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp index a9d244583f..af6cb7d390 100644 --- a/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp @@ -16,7 +16,7 @@ #include "../../drawing/Drawing.h" #include "../../interface/Viewport.h" -#include "../../paint/tile_element/TileElement.h" +#include "../../paint/tile_element/Paint.TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" diff --git a/src/openrct2/ride/coaster/WoodenWildMouse.cpp b/src/openrct2/ride/coaster/WoodenWildMouse.cpp index ba89e29c6f..c7bd3fa3cb 100644 --- a/src/openrct2/ride/coaster/WoodenWildMouse.cpp +++ b/src/openrct2/ride/coaster/WoodenWildMouse.cpp @@ -16,7 +16,7 @@ #include "../../drawing/Drawing.h" #include "../../interface/Viewport.h" -#include "../../paint/tile_element/TileElement.h" +#include "../../paint/tile_element/Paint.TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" diff --git a/src/openrct2/ride/gentle/Maze.cpp b/src/openrct2/ride/gentle/Maze.cpp index 6bb4590c85..5cec876e04 100644 --- a/src/openrct2/ride/gentle/Maze.cpp +++ b/src/openrct2/ride/gentle/Maze.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "../../interface/Viewport.h" -#include "../../paint/tile_element/Surface.h" +#include "../../paint/tile_element/Paint.Surface.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" diff --git a/src/openrct2/ride/transport/SuspendedMonorail.cpp b/src/openrct2/ride/transport/SuspendedMonorail.cpp index 04bb5f1abb..4c38a754fd 100644 --- a/src/openrct2/ride/transport/SuspendedMonorail.cpp +++ b/src/openrct2/ride/transport/SuspendedMonorail.cpp @@ -16,7 +16,7 @@ #include "../../drawing/Drawing.h" #include "../../interface/Viewport.h" -#include "../../paint/tile_element/TileElement.h" +#include "../../paint/tile_element/Paint.TileElement.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" diff --git a/src/openrct2/world/Particle.cpp b/src/openrct2/world/Particle.cpp index 16daabb6ea..adcd6ddf47 100644 --- a/src/openrct2/world/Particle.cpp +++ b/src/openrct2/world/Particle.cpp @@ -17,7 +17,7 @@ #include "../audio/audio.h" #include "../core/Util.hpp" #include "../scenario/Scenario.h" -#include "../paint/sprite/Sprite.h" +#include "../paint/sprite/Paint.Sprite.h" #include "Sprite.h" /** diff --git a/test/testpaint/Compat.cpp b/test/testpaint/Compat.cpp index d2d9877969..ffbbdcbc1f 100644 --- a/test/testpaint/Compat.cpp +++ b/test/testpaint/Compat.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/test/testpaint/SegmentSupportHeightCall.cpp b/test/testpaint/SegmentSupportHeightCall.cpp index 4eebb7942c..282c30e2c5 100644 --- a/test/testpaint/SegmentSupportHeightCall.cpp +++ b/test/testpaint/SegmentSupportHeightCall.cpp @@ -19,7 +19,7 @@ #include "SegmentSupportHeightCall.hpp" -#include +#include static bool SortSegmentSupportCalls(SegmentSupportCall lhs, SegmentSupportCall rhs) { diff --git a/test/testpaint/TestPaint.hpp b/test/testpaint/TestPaint.hpp index ddbc46fe3f..3a60ae6836 100644 --- a/test/testpaint/TestPaint.hpp +++ b/test/testpaint/TestPaint.hpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include "Addresses.h" #define gRideEntries RCT2_ADDRESS(0x009ACFA4, rct_ride_entry*) diff --git a/test/testpaint/TestTrack.cpp b/test/testpaint/TestTrack.cpp index 75fc131f13..4f26b28a27 100644 --- a/test/testpaint/TestTrack.cpp +++ b/test/testpaint/TestTrack.cpp @@ -29,7 +29,7 @@ #include "Utils.hpp" #include "VerticalTunnelCall.hpp" -#include +#include #include #include #include From 5a0fed668bb05c552975af4423bdef1f958bc540 Mon Sep 17 00:00:00 2001 From: Aaron van Geffen Date: Fri, 1 Jun 2018 09:43:57 +0200 Subject: [PATCH 5/5] Update Xcode project. --- OpenRCT2.xcodeproj/project.pbxproj | 167 +++++++++++++++-------------- 1 file changed, 84 insertions(+), 83 deletions(-) diff --git a/OpenRCT2.xcodeproj/project.pbxproj b/OpenRCT2.xcodeproj/project.pbxproj index a4370812a5..28393f72e9 100644 --- a/OpenRCT2.xcodeproj/project.pbxproj +++ b/OpenRCT2.xcodeproj/project.pbxproj @@ -43,6 +43,12 @@ 9346F9DB208A191900C77D91 /* GuestPathfinding.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9346F9D7208A191900C77D91 /* GuestPathfinding.cpp */; }; 9346F9DC208A191900C77D91 /* GuestPathfinding.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9346F9D7208A191900C77D91 /* GuestPathfinding.cpp */; }; 9346F9DD208A191900C77D91 /* GuestPathfinding.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9346F9D7208A191900C77D91 /* GuestPathfinding.cpp */; }; + 939A359A20C12FC800630B3F /* Paint.Litter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 939A359720C12FC700630B3F /* Paint.Litter.cpp */; }; + 939A359B20C12FC800630B3F /* Paint.Misc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 939A359820C12FC700630B3F /* Paint.Misc.cpp */; }; + 939A359C20C12FC800630B3F /* Paint.Sprite.h in Headers */ = {isa = PBXBuildFile; fileRef = 939A359920C12FC700630B3F /* Paint.Sprite.h */; }; + 939A359F20C12FDE00630B3F /* Paint.Surface.h in Headers */ = {isa = PBXBuildFile; fileRef = 939A359D20C12FDD00630B3F /* Paint.Surface.h */; }; + 939A35A020C12FDE00630B3F /* Paint.TileElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 939A359E20C12FDE00630B3F /* Paint.TileElement.h */; }; + 939A35A220C12FFD00630B3F /* InteractiveConsole.h in Headers */ = {isa = PBXBuildFile; fileRef = 939A35A120C12FFD00630B3F /* InteractiveConsole.h */; }; 93AF4A6520B462F8006489A5 /* libicuuc.61.1.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 93AF4A6220B462F7006489A5 /* libicuuc.61.1.dylib */; }; 93AF4A6720B462F8006489A5 /* libicudata.61.1.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 93AF4A6320B462F7006489A5 /* libicudata.61.1.dylib */; }; 93AF4A6820B46400006489A5 /* libicudata.61.1.dylib in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 93AF4A6320B462F7006489A5 /* libicudata.61.1.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; @@ -56,16 +62,28 @@ 93CBA4CA20A7504500867D56 /* ImageImporter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93CBA4C720A7504400867D56 /* ImageImporter.cpp */; }; 93CBA4CB20A7504500867D56 /* ImageImporter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93CBA4C720A7504400867D56 /* ImageImporter.cpp */; }; 93CBA4CC20A7504500867D56 /* ImageImporter.h in Headers */ = {isa = PBXBuildFile; fileRef = 93CBA4C820A7504500867D56 /* ImageImporter.h */; }; + 93DE9751209C3C1000FB1CC8 /* GameState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93DE974E209C3C0F00FB1CC8 /* GameState.cpp */; }; + 93DE9753209C3C1000FB1CC8 /* GameState.h in Headers */ = {isa = PBXBuildFile; fileRef = 93DE974F209C3C0F00FB1CC8 /* GameState.h */; }; + 93F76EED20BFF6F900D4512C /* Drawing.Sprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93F76EEB20BFF6F900D4512C /* Drawing.Sprite.cpp */; }; + 93F76EEE20BFF6F900D4512C /* Drawing.String.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93F76EEC20BFF6F900D4512C /* Drawing.String.cpp */; }; + 93F76EF020BFF71700D4512C /* InteractiveConsole.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93F76EEF20BFF71700D4512C /* InteractiveConsole.cpp */; }; + 93F76EF220BFF74200D4512C /* Localisation.Date.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93F76EF120BFF74200D4512C /* Localisation.Date.cpp */; }; + 93F76EF520BFF76E00D4512C /* Paint.Peep.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93F76EF320BFF76D00D4512C /* Paint.Peep.cpp */; }; + 93F76EF620BFF76E00D4512C /* Paint.Sprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93F76EF420BFF76D00D4512C /* Paint.Sprite.cpp */; }; + 93F76EFF20BFF77B00D4512C /* Paint.Wall.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93F76EF720BFF77900D4512C /* Paint.Wall.cpp */; }; + 93F76F0020BFF77B00D4512C /* Paint.Path.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93F76EF820BFF77900D4512C /* Paint.Path.cpp */; }; + 93F76F0120BFF77B00D4512C /* Paint.LargeScenery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93F76EF920BFF77900D4512C /* Paint.LargeScenery.cpp */; }; + 93F76F0220BFF77B00D4512C /* Paint.Surface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93F76EFA20BFF77900D4512C /* Paint.Surface.cpp */; }; + 93F76F0320BFF77B00D4512C /* Paint.SmallScenery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93F76EFB20BFF77A00D4512C /* Paint.SmallScenery.cpp */; }; + 93F76F0420BFF77B00D4512C /* Paint.Banner.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93F76EFC20BFF77A00D4512C /* Paint.Banner.cpp */; }; + 93F76F0520BFF77B00D4512C /* Paint.TileElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93F76EFD20BFF77A00D4512C /* Paint.TileElement.cpp */; }; + 93F76F0620BFF77B00D4512C /* Paint.Entrance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93F76EFE20BFF77A00D4512C /* Paint.Entrance.cpp */; }; 93F9DA3620B46F3100D1BE92 /* libicudata.61.1.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 93AF4A6320B462F7006489A5 /* libicudata.61.1.dylib */; }; 93F9DA3720B46F3100D1BE92 /* libicuuc.61.1.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 93AF4A6220B462F7006489A5 /* libicuuc.61.1.dylib */; }; 93F9DA3820B46F9D00D1BE92 /* ShopItem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CDCB0BC20A9902E00321367 /* ShopItem.cpp */; }; 93F9DA3920B46FB800D1BE92 /* ObjectJsonHelpers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE9AAAB1FDA7B14004093C6 /* ObjectJsonHelpers.cpp */; }; 93F9DA3A20B46FCA00D1BE92 /* SceneryObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C1A53EC205FD19F000F8EF5 /* SceneryObject.cpp */; }; 93F9DA3B20B4701100D1BE92 /* StdInOutConsole.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C3B423720591513000C5BB7 /* StdInOutConsole.cpp */; }; - 93DE9750209C3C1000FB1CC8 /* GameState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93DE974E209C3C0F00FB1CC8 /* GameState.cpp */; }; - 93DE9751209C3C1000FB1CC8 /* GameState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93DE974E209C3C0F00FB1CC8 /* GameState.cpp */; }; - 93DE9752209C3C1000FB1CC8 /* GameState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93DE974E209C3C0F00FB1CC8 /* GameState.cpp */; }; - 93DE9753209C3C1000FB1CC8 /* GameState.h in Headers */ = {isa = PBXBuildFile; fileRef = 93DE974F209C3C0F00FB1CC8 /* GameState.h */; }; C61ADB1F1FB6A0A70024F2EF /* TopToolbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C61ADB1E1FB6A0A60024F2EF /* TopToolbar.cpp */; }; C61ADB211FB7DC060024F2EF /* Scenery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C61ADB201FB7DC060024F2EF /* Scenery.cpp */; }; C61ADB231FBBCB8B0024F2EF /* GameBottomToolbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C61ADB221FBBCB8A0024F2EF /* GameBottomToolbar.cpp */; }; @@ -210,7 +228,6 @@ C688788120289ADE0084B384 /* Line.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B53CD200029CE00A52E21 /* Line.cpp */; }; C688788220289ADE0084B384 /* Rect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B53CF200029D900A52E21 /* Rect.cpp */; }; C688788320289ADE0084B384 /* ScrollingText.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B53D0200029D900A52E21 /* ScrollingText.cpp */; }; - C688788420289ADE0084B384 /* String.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B53D3200029E000A52E21 /* String.cpp */; }; C688788520289ADE0084B384 /* Text.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C651A8D71F30204300443BCA /* Text.cpp */; }; C688788620289ADE0084B384 /* TTF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B53D820002CA400A52E21 /* TTF.cpp */; }; C688788720289ADE0084B384 /* TTFSDLPort.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B54682007BF2E00A52E21 /* TTFSDLPort.cpp */; }; @@ -218,7 +235,6 @@ C688788E20289AE70084B384 /* SSE41Drawing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C6A66BB1FED04EE00694CB6 /* SSE41Drawing.cpp */; settings = {COMPILER_FLAGS = "-msse4.1"; }; }; C688788F20289B140084B384 /* Chat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B53DD200143C200A52E21 /* Chat.cpp */; }; C688789020289B140084B384 /* Colour.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B53DF200143C200A52E21 /* Colour.cpp */; }; - C688789120289B140084B384 /* Console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B53E1200143C200A52E21 /* Console.cpp */; }; C688789220289B140084B384 /* FontFamilies.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B53E4200143C200A52E21 /* FontFamilies.cpp */; }; C688789320289B140084B384 /* Fonts.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B53E6200143C200A52E21 /* Fonts.cpp */; }; C688789420289B140084B384 /* Screenshot.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B53E8200143C200A52E21 /* Screenshot.cpp */; }; @@ -230,7 +246,6 @@ C688789A20289B200084B384 /* ConversionTables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B53C61FFF94F900A52E21 /* ConversionTables.cpp */; }; C688789B20289B200084B384 /* Convert.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B53AA1FFF935B00A52E21 /* Convert.cpp */; }; C688789C20289B200084B384 /* Currency.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B53AB1FFF935B00A52E21 /* Currency.cpp */; }; - C688789D20289B200084B384 /* Date.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B53AD1FFF935B00A52E21 /* Date.cpp */; }; C688789E20289B200084B384 /* FormatCodes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B53AF1FFF935B00A52E21 /* FormatCodes.cpp */; }; C688789F20289B200084B384 /* Language.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B53B11FFF935B00A52E21 /* Language.cpp */; }; C68878A020289B200084B384 /* LanguagePack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B53B31FFF935B00A52E21 /* LanguagePack.cpp */; }; @@ -258,18 +273,6 @@ C68878CC20289B710084B384 /* SoftwareDrawingEngine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C85A61EC4E82600FA49E2 /* SoftwareDrawingEngine.cpp */; }; C68878CD20289B9B0084B384 /* DefaultObjects.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F7B2048B2024E7800000AD7E /* DefaultObjects.cpp */; }; C68878CE20289B9B0084B384 /* ObjectList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B53A31FFC180400A52E21 /* ObjectList.cpp */; }; - C68878CF20289B9B0084B384 /* Litter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C6A66931FE2786F00694CB6 /* Litter.cpp */; }; - C68878D020289B9B0084B384 /* Misc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C6A66941FE2786F00694CB6 /* Misc.cpp */; }; - C68878D120289B9B0084B384 /* Peep.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C6A66951FE2786F00694CB6 /* Peep.cpp */; }; - C68878D220289B9B0084B384 /* Sprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C6A66961FE2786F00694CB6 /* Sprite.cpp */; }; - C68878D320289B9B0084B384 /* Banner.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C6A669C1FE2787700694CB6 /* Banner.cpp */; }; - C68878D420289B9B0084B384 /* Entrance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C6A669D1FE2787700694CB6 /* Entrance.cpp */; }; - C68878D520289B9B0084B384 /* Fence.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C6A669E1FE2787700694CB6 /* Fence.cpp */; }; - C68878D620289B9B0084B384 /* LargeScenery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C6A669F1FE2787700694CB6 /* LargeScenery.cpp */; }; - C68878D720289B9B0084B384 /* Path.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C6A66A01FE2787700694CB6 /* Path.cpp */; }; - C68878D820289B9B0084B384 /* SmallScenery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C6A66A11FE2787700694CB6 /* SmallScenery.cpp */; }; - C68878D920289B9B0084B384 /* Surface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C6A66A21FE2787700694CB6 /* Surface.cpp */; }; - C68878DA20289B9B0084B384 /* TileElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C6A66A41FE2787700694CB6 /* TileElement.cpp */; }; C68878DB20289B9B0084B384 /* Paint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C6A66AE1FE278C900694CB6 /* Paint.cpp */; }; C68878DC20289B9B0084B384 /* Painter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C6A66B01FE278C900694CB6 /* Painter.cpp */; }; C68878DD20289B9B0084B384 /* PaintHelpers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C6A66B21FE278C900694CB6 /* PaintHelpers.cpp */; }; @@ -420,7 +423,6 @@ F76C85F91EC4E88300FA49E2 /* Image.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C83A51EC4E7CC00FA49E2 /* Image.cpp */; }; F76C85FD1EC4E88300FA49E2 /* NewDrawing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C83A91EC4E7CC00FA49E2 /* NewDrawing.cpp */; }; F76C85FF1EC4E88300FA49E2 /* Rain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C83AB1EC4E7CC00FA49E2 /* Rain.cpp */; }; - F76C86031EC4E88300FA49E2 /* Sprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C83AF1EC4E7CC00FA49E2 /* Sprite.cpp */; }; F76C86051EC4E88300FA49E2 /* Editor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C83B11EC4E7CC00FA49E2 /* Editor.cpp */; }; F76C86071EC4E88300FA49E2 /* FileClassifier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C83B31EC4E7CC00FA49E2 /* FileClassifier.cpp */; }; F76C86451EC4E88300FA49E2 /* Http.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C83F61EC4E7CC00FA49E2 /* Http.cpp */; }; @@ -616,21 +618,6 @@ 4C6A668D1FE14C3A00694CB6 /* Util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Util.h; sourceTree = ""; }; 4C6A66901FE14C9500694CB6 /* Cheats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Cheats.cpp; sourceTree = ""; }; 4C6A66911FE14C9500694CB6 /* Cheats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Cheats.h; sourceTree = ""; }; - 4C6A66931FE2786F00694CB6 /* Litter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Litter.cpp; sourceTree = ""; }; - 4C6A66941FE2786F00694CB6 /* Misc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Misc.cpp; sourceTree = ""; }; - 4C6A66951FE2786F00694CB6 /* Peep.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Peep.cpp; sourceTree = ""; }; - 4C6A66961FE2786F00694CB6 /* Sprite.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Sprite.cpp; sourceTree = ""; }; - 4C6A66971FE2786F00694CB6 /* Sprite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Sprite.h; sourceTree = ""; }; - 4C6A669C1FE2787700694CB6 /* Banner.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Banner.cpp; sourceTree = ""; }; - 4C6A669D1FE2787700694CB6 /* Entrance.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Entrance.cpp; sourceTree = ""; }; - 4C6A669E1FE2787700694CB6 /* Fence.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Fence.cpp; sourceTree = ""; }; - 4C6A669F1FE2787700694CB6 /* LargeScenery.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LargeScenery.cpp; sourceTree = ""; }; - 4C6A66A01FE2787700694CB6 /* Path.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Path.cpp; sourceTree = ""; }; - 4C6A66A11FE2787700694CB6 /* SmallScenery.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SmallScenery.cpp; sourceTree = ""; }; - 4C6A66A21FE2787700694CB6 /* Surface.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Surface.cpp; sourceTree = ""; }; - 4C6A66A31FE2787700694CB6 /* Surface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Surface.h; sourceTree = ""; }; - 4C6A66A41FE2787700694CB6 /* TileElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TileElement.cpp; sourceTree = ""; }; - 4C6A66A51FE2787700694CB6 /* TileElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TileElement.h; sourceTree = ""; }; 4C6A66AE1FE278C900694CB6 /* Paint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Paint.cpp; sourceTree = ""; }; 4C6A66AF1FE278C900694CB6 /* Paint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Paint.h; sourceTree = ""; }; 4C6A66B01FE278C900694CB6 /* Painter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Painter.cpp; sourceTree = ""; }; @@ -651,7 +638,6 @@ 4C7B53AA1FFF935B00A52E21 /* Convert.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Convert.cpp; sourceTree = ""; }; 4C7B53AB1FFF935B00A52E21 /* Currency.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Currency.cpp; sourceTree = ""; }; 4C7B53AC1FFF935B00A52E21 /* Currency.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Currency.h; sourceTree = ""; }; - 4C7B53AD1FFF935B00A52E21 /* Date.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Date.cpp; sourceTree = ""; }; 4C7B53AE1FFF935B00A52E21 /* Date.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Date.h; sourceTree = ""; }; 4C7B53AF1FFF935B00A52E21 /* FormatCodes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FormatCodes.cpp; sourceTree = ""; }; 4C7B53B01FFF935B00A52E21 /* FormatCodes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FormatCodes.h; sourceTree = ""; }; @@ -671,7 +657,6 @@ 4C7B53CD200029CE00A52E21 /* Line.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Line.cpp; sourceTree = ""; }; 4C7B53CF200029D900A52E21 /* Rect.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Rect.cpp; sourceTree = ""; }; 4C7B53D0200029D900A52E21 /* ScrollingText.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScrollingText.cpp; sourceTree = ""; }; - 4C7B53D3200029E000A52E21 /* String.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = String.cpp; sourceTree = ""; }; 4C7B53D520002CA400A52E21 /* Drawing.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Drawing.cpp; sourceTree = ""; }; 4C7B53D620002CA400A52E21 /* Font.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Font.cpp; sourceTree = ""; }; 4C7B53D720002CA400A52E21 /* LightFX.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LightFX.cpp; sourceTree = ""; }; @@ -680,8 +665,6 @@ 4C7B53DE200143C200A52E21 /* Chat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Chat.h; sourceTree = ""; }; 4C7B53DF200143C200A52E21 /* Colour.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Colour.cpp; sourceTree = ""; }; 4C7B53E0200143C200A52E21 /* Colour.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Colour.h; sourceTree = ""; }; - 4C7B53E1200143C200A52E21 /* Console.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Console.cpp; sourceTree = ""; }; - 4C7B53E2200143C200A52E21 /* Console.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Console.h; sourceTree = ""; }; 4C7B53E3200143C200A52E21 /* Cursors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Cursors.h; sourceTree = ""; }; 4C7B53E4200143C200A52E21 /* FontFamilies.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FontFamilies.cpp; sourceTree = ""; }; 4C7B53E5200143C200A52E21 /* FontFamilies.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FontFamilies.h; sourceTree = ""; }; @@ -754,7 +737,6 @@ 4C7B54792010DF4C00A52E21 /* Shared.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Shared.cpp; sourceTree = ""; }; 4C7B547A2010DF4C00A52E21 /* Windows.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Windows.cpp; sourceTree = ""; }; 4C7B547E2010DFF700A52E21 /* Crash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Crash.h; sourceTree = ""; }; - 4C80798D2062AFE400C5850B /* HandleParkLoad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HandleParkLoad.h; sourceTree = ""; }; 4C8667801EEFDCDF0024AAB8 /* RideGroupManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RideGroupManager.cpp; sourceTree = ""; }; 4C8667811EEFDCDF0024AAB8 /* RideGroupManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RideGroupManager.h; sourceTree = ""; }; 4C8B426E1EEB1ABD00F015CA /* X8DrawingEngine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = X8DrawingEngine.cpp; sourceTree = ""; }; @@ -1115,6 +1097,12 @@ 9350B52720B46E0900897BC5 /* ftbdf.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ftbdf.h; sourceTree = ""; }; 9350B52820B46E0900897BC5 /* ftrender.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ftrender.h; sourceTree = ""; }; 9350B52920B46E0900897BC5 /* ft2build.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ft2build.h; sourceTree = ""; }; + 939A359720C12FC700630B3F /* Paint.Litter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Paint.Litter.cpp; sourceTree = ""; }; + 939A359820C12FC700630B3F /* Paint.Misc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Paint.Misc.cpp; sourceTree = ""; }; + 939A359920C12FC700630B3F /* Paint.Sprite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Paint.Sprite.h; sourceTree = ""; }; + 939A359D20C12FDD00630B3F /* Paint.Surface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Paint.Surface.h; sourceTree = ""; }; + 939A359E20C12FDE00630B3F /* Paint.TileElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Paint.TileElement.h; sourceTree = ""; }; + 939A35A120C12FFD00630B3F /* InteractiveConsole.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InteractiveConsole.h; sourceTree = ""; }; 93AF4A6220B462F7006489A5 /* libicuuc.61.1.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = libicuuc.61.1.dylib; sourceTree = ""; }; 93AF4A6320B462F7006489A5 /* libicudata.61.1.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = libicudata.61.1.dylib; sourceTree = ""; }; 93CBA4BE20A74FF200867D56 /* BitmapReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BitmapReader.h; sourceTree = ""; }; @@ -1125,6 +1113,20 @@ 93CBA4C820A7504500867D56 /* ImageImporter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageImporter.h; sourceTree = ""; }; 93DE974E209C3C0F00FB1CC8 /* GameState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GameState.cpp; sourceTree = ""; }; 93DE974F209C3C0F00FB1CC8 /* GameState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GameState.h; sourceTree = ""; }; + 93F76EEB20BFF6F900D4512C /* Drawing.Sprite.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Drawing.Sprite.cpp; sourceTree = ""; }; + 93F76EEC20BFF6F900D4512C /* Drawing.String.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Drawing.String.cpp; sourceTree = ""; }; + 93F76EEF20BFF71700D4512C /* InteractiveConsole.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InteractiveConsole.cpp; sourceTree = ""; }; + 93F76EF120BFF74200D4512C /* Localisation.Date.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Localisation.Date.cpp; sourceTree = ""; }; + 93F76EF320BFF76D00D4512C /* Paint.Peep.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Paint.Peep.cpp; sourceTree = ""; }; + 93F76EF420BFF76D00D4512C /* Paint.Sprite.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Paint.Sprite.cpp; sourceTree = ""; }; + 93F76EF720BFF77900D4512C /* Paint.Wall.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Paint.Wall.cpp; sourceTree = ""; }; + 93F76EF820BFF77900D4512C /* Paint.Path.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Paint.Path.cpp; sourceTree = ""; }; + 93F76EF920BFF77900D4512C /* Paint.LargeScenery.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Paint.LargeScenery.cpp; sourceTree = ""; }; + 93F76EFA20BFF77900D4512C /* Paint.Surface.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Paint.Surface.cpp; sourceTree = ""; }; + 93F76EFB20BFF77A00D4512C /* Paint.SmallScenery.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Paint.SmallScenery.cpp; sourceTree = ""; }; + 93F76EFC20BFF77A00D4512C /* Paint.Banner.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Paint.Banner.cpp; sourceTree = ""; }; + 93F76EFD20BFF77A00D4512C /* Paint.TileElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Paint.TileElement.cpp; sourceTree = ""; }; + 93F76EFE20BFF77A00D4512C /* Paint.Entrance.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Paint.Entrance.cpp; sourceTree = ""; }; C61ADB1E1FB6A0A60024F2EF /* TopToolbar.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TopToolbar.cpp; sourceTree = ""; }; C61ADB201FB7DC060024F2EF /* Scenery.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Scenery.cpp; sourceTree = ""; }; C61ADB221FBBCB8A0024F2EF /* GameBottomToolbar.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GameBottomToolbar.cpp; sourceTree = ""; }; @@ -1472,7 +1474,6 @@ F76C83AA1EC4E7CC00FA49E2 /* NewDrawing.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NewDrawing.h; sourceTree = ""; }; F76C83AB1EC4E7CC00FA49E2 /* Rain.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Rain.cpp; sourceTree = ""; }; F76C83AC1EC4E7CC00FA49E2 /* Rain.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Rain.h; sourceTree = ""; }; - F76C83AF1EC4E7CC00FA49E2 /* Sprite.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Sprite.cpp; sourceTree = ""; }; F76C83B11EC4E7CC00FA49E2 /* Editor.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; path = Editor.cpp; sourceTree = ""; }; F76C83B21EC4E7CC00FA49E2 /* Editor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Editor.h; sourceTree = ""; }; F76C83B31EC4E7CC00FA49E2 /* FileClassifier.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = FileClassifier.cpp; sourceTree = ""; }; @@ -2335,7 +2336,6 @@ F76C83B41EC4E7CC00FA49E2 /* FileClassifier.h */, 4CE4623F1FD0710E0001CD98 /* Game.cpp */, 4CE462401FD0710E0001CD98 /* Game.h */, - 4C80798D2062AFE400C5850B /* HandleParkLoad.h */, 4CC4B8E81FE00C5D00660D62 /* Input.cpp */, 4CC4B8E91FE00C5D00660D62 /* Input.h */, 4CC4B8EA1FE00C5D00660D62 /* Intro.cpp */, @@ -2449,14 +2449,16 @@ F7C44AF62030E74B007E099F /* AVX2Drawing.cpp */, 4C7B53D520002CA400A52E21 /* Drawing.cpp */, F76C839F1EC4E7CC00FA49E2 /* drawing.h */, + 93F76EEB20BFF6F900D4512C /* Drawing.Sprite.cpp */, + 93F76EEC20BFF6F900D4512C /* Drawing.String.cpp */, F76C83A01EC4E7CC00FA49E2 /* DrawingFast.cpp */, 4C7B53D620002CA400A52E21 /* Font.cpp */, 4C7B53CB1FFF995100A52E21 /* Font.h */, F76C83A31EC4E7CC00FA49E2 /* IDrawingContext.h */, - 93CBA4C720A7504400867D56 /* ImageImporter.cpp */, - 93CBA4C820A7504500867D56 /* ImageImporter.h */, F76C83A41EC4E7CC00FA49E2 /* IDrawingEngine.h */, F76C83A51EC4E7CC00FA49E2 /* Image.cpp */, + 93CBA4C720A7504400867D56 /* ImageImporter.cpp */, + 93CBA4C820A7504500867D56 /* ImageImporter.h */, 4C7B53D720002CA400A52E21 /* LightFX.cpp */, F76C83A71EC4E7CC00FA49E2 /* lightfx.h */, 4C7B53CD200029CE00A52E21 /* Line.cpp */, @@ -2466,9 +2468,7 @@ F76C83AC1EC4E7CC00FA49E2 /* Rain.h */, 4C7B53CF200029D900A52E21 /* Rect.cpp */, 4C7B53D0200029D900A52E21 /* ScrollingText.cpp */, - F76C83AF1EC4E7CC00FA49E2 /* Sprite.cpp */, 4C6A66BB1FED04EE00694CB6 /* SSE41Drawing.cpp */, - 4C7B53D3200029E000A52E21 /* String.cpp */, C651A8D71F30204300443BCA /* Text.cpp */, C651A8D81F30204300443BCA /* Text.h */, 4C7B53D820002CA400A52E21 /* TTF.cpp */, @@ -2487,13 +2487,13 @@ 4C7B53DE200143C200A52E21 /* Chat.h */, 4C7B53DF200143C200A52E21 /* Colour.cpp */, 4C7B53E0200143C200A52E21 /* Colour.h */, - 4C7B53E1200143C200A52E21 /* Console.cpp */, - 4C7B53E2200143C200A52E21 /* Console.h */, 4C7B53E3200143C200A52E21 /* Cursors.h */, 4C7B53E4200143C200A52E21 /* FontFamilies.cpp */, 4C7B53E5200143C200A52E21 /* FontFamilies.h */, 4C7B53E6200143C200A52E21 /* Fonts.cpp */, 4C7B53E7200143C200A52E21 /* Fonts.h */, + 93F76EEF20BFF71700D4512C /* InteractiveConsole.cpp */, + 939A35A120C12FFD00630B3F /* InteractiveConsole.h */, 4C7B53E8200143C200A52E21 /* Screenshot.cpp */, 4C7B53E9200143C200A52E21 /* Screenshot.h */, 4C3B423720591513000C5BB7 /* StdInOutConsole.cpp */, @@ -2518,12 +2518,12 @@ 4C7B53AA1FFF935B00A52E21 /* Convert.cpp */, 4C7B53AB1FFF935B00A52E21 /* Currency.cpp */, 4C7B53AC1FFF935B00A52E21 /* Currency.h */, - 4C7B53AD1FFF935B00A52E21 /* Date.cpp */, 4C7B53AE1FFF935B00A52E21 /* Date.h */, 4C7B53AF1FFF935B00A52E21 /* FormatCodes.cpp */, 4C7B53B01FFF935B00A52E21 /* FormatCodes.h */, 4C7B53B11FFF935B00A52E21 /* Language.cpp */, 4C7B53C91FFF991000A52E21 /* Language.h */, + 93F76EF120BFF74200D4512C /* Localisation.Date.cpp */, 933F2CB620935653001B33FD /* LocalisationService.cpp */, 933F2CBA20935668001B33FD /* LocalisationService.h */, 4C7B53B31FFF935B00A52E21 /* LanguagePack.cpp */, @@ -2660,16 +2660,16 @@ F76C843B1EC4E7CC00FA49E2 /* tile_element */ = { isa = PBXGroup; children = ( - 4C6A669C1FE2787700694CB6 /* Banner.cpp */, - 4C6A669D1FE2787700694CB6 /* Entrance.cpp */, - 4C6A669E1FE2787700694CB6 /* Fence.cpp */, - 4C6A669F1FE2787700694CB6 /* LargeScenery.cpp */, - 4C6A66A01FE2787700694CB6 /* Path.cpp */, - 4C6A66A11FE2787700694CB6 /* SmallScenery.cpp */, - 4C6A66A21FE2787700694CB6 /* Surface.cpp */, - 4C6A66A31FE2787700694CB6 /* Surface.h */, - 4C6A66A41FE2787700694CB6 /* TileElement.cpp */, - 4C6A66A51FE2787700694CB6 /* TileElement.h */, + 93F76EFC20BFF77A00D4512C /* Paint.Banner.cpp */, + 93F76EFE20BFF77A00D4512C /* Paint.Entrance.cpp */, + 93F76EF920BFF77900D4512C /* Paint.LargeScenery.cpp */, + 93F76EF820BFF77900D4512C /* Paint.Path.cpp */, + 93F76EFB20BFF77A00D4512C /* Paint.SmallScenery.cpp */, + 93F76EFA20BFF77900D4512C /* Paint.Surface.cpp */, + 939A359D20C12FDD00630B3F /* Paint.Surface.h */, + 93F76EFD20BFF77A00D4512C /* Paint.TileElement.cpp */, + 939A359E20C12FDE00630B3F /* Paint.TileElement.h */, + 93F76EF720BFF77900D4512C /* Paint.Wall.cpp */, ); path = tile_element; sourceTree = ""; @@ -2677,11 +2677,11 @@ F76C84491EC4E7CC00FA49E2 /* sprite */ = { isa = PBXGroup; children = ( - 4C6A66931FE2786F00694CB6 /* Litter.cpp */, - 4C6A66941FE2786F00694CB6 /* Misc.cpp */, - 4C6A66951FE2786F00694CB6 /* Peep.cpp */, - 4C6A66961FE2786F00694CB6 /* Sprite.cpp */, - 4C6A66971FE2786F00694CB6 /* Sprite.h */, + 939A359720C12FC700630B3F /* Paint.Litter.cpp */, + 939A359820C12FC700630B3F /* Paint.Misc.cpp */, + 93F76EF320BFF76D00D4512C /* Paint.Peep.cpp */, + 93F76EF420BFF76D00D4512C /* Paint.Sprite.cpp */, + 939A359920C12FC700630B3F /* Paint.Sprite.h */, ); path = sprite; sourceTree = ""; @@ -3239,10 +3239,12 @@ buildActionMask = 2147483647; files = ( C67B28172002D67A00109C93 /* Viewport.h in Headers */, + 939A359C20C12FC800630B3F /* Paint.Sprite.h in Headers */, 9308DA04209908090079EE96 /* TileElement.h in Headers */, C67B28152002D67A00109C93 /* Widget.h in Headers */, C6352B951F477032006CCEE3 /* RideCreateAction.hpp in Headers */, C6352B851F477022006CCEE3 /* DataSerialiserTraits.h in Headers */, + 939A359F20C12FDE00630B3F /* Paint.Surface.h in Headers */, C67B28192002D7F200109C93 /* Window_internal.h in Headers */, C6352B971F477032006CCEE3 /* SetParkEntranceFeeAction.hpp in Headers */, 933F2CBB20935668001B33FD /* LocalisationService.h in Headers */, @@ -3251,10 +3253,12 @@ C6352B941F477032006CCEE3 /* PlaceParkEntranceAction.hpp in Headers */, C6352B911F477032006CCEE3 /* GameAction.h in Headers */, C62D838B1FD36D6F008C04F1 /* EditorObjectSelectionSession.h in Headers */, + 939A35A220C12FFD00630B3F /* InteractiveConsole.h in Headers */, 93CBA4C320A7502E00867D56 /* Imaging.h in Headers */, 9308DA05209908090079EE96 /* Surface.h in Headers */, 93DE9753209C3C1000FB1CC8 /* GameState.h in Headers */, C6352B841F477022006CCEE3 /* DataSerialiser.h in Headers */, + 939A35A020C12FDE00630B3F /* Paint.TileElement.h in Headers */, C67B28162002D67A00109C93 /* Window.h in Headers */, C6352B961F477032006CCEE3 /* RideSetStatus.hpp in Headers */, ); @@ -3609,7 +3613,6 @@ C666ED761F33DBB20061AA04 /* ShortcutKeyChange.cpp in Sources */, C685E51C1F8907850090598F /* Map.cpp in Sources */, F7CB864A1EEDA1330030C877 /* KeyboardShortcuts.cpp in Sources */, - 93DE9750209C3C1000FB1CC8 /* GameState.cpp in Sources */, C654DF381F69C0430040F43D /* StaffFirePrompt.cpp in Sources */, C68313D51FDB4F4C006DB3D8 /* Graph.cpp in Sources */, C685E51D1F8907850090598F /* Research.cpp in Sources */, @@ -3699,6 +3702,7 @@ C688792520289B9B0084B384 /* RotoDrop.cpp in Sources */, F76C85BA1EC4E88300FA49E2 /* CommandLine.cpp in Sources */, C68878EE20289B9B0084B384 /* BolligerMabillardTrack.cpp in Sources */, + 93F76F0420BFF77B00D4512C /* Paint.Banner.cpp in Sources */, F76C85BC1EC4E88300FA49E2 /* ConvertCommand.cpp in Sources */, F76C85BD1EC4E88300FA49E2 /* RootCommands.cpp in Sources */, C688791320289B9B0084B384 /* HauntedHouse.cpp in Sources */, @@ -3710,14 +3714,16 @@ F76C85C01EC4E88300FA49E2 /* UriHandler.cpp in Sources */, C688786220289A0A0084B384 /* MapGen.cpp in Sources */, C68878A820289B2A0084B384 /* NewsItem.cpp in Sources */, + 93F76EED20BFF6F900D4512C /* Drawing.Sprite.cpp in Sources */, 933F2CB820935653001B33FD /* LocalisationService.cpp in Sources */, F76C85C41EC4E88300FA49E2 /* Config.cpp in Sources */, - C688789120289B140084B384 /* Console.cpp in Sources */, C688792920289B9B0084B384 /* Chairlift.cpp in Sources */, C68878A020289B200084B384 /* LanguagePack.cpp in Sources */, F76C85C71EC4E88300FA49E2 /* IniReader.cpp in Sources */, + 93F76F0020BFF77B00D4512C /* Paint.Path.cpp in Sources */, F76C85C91EC4E88300FA49E2 /* IniWriter.cpp in Sources */, C688792620289B9B0084B384 /* SwingingInverterShip.cpp in Sources */, + 93F76EF220BFF74200D4512C /* Localisation.Date.cpp in Sources */, F76C85CC1EC4E88300FA49E2 /* Context.cpp in Sources */, C68878E220289B9B0084B384 /* Staff.cpp in Sources */, F76C85CF1EC4E88300FA49E2 /* Console.cpp in Sources */, @@ -3729,7 +3735,6 @@ C688790220289B9B0084B384 /* SideFrictionRollerCoaster.cpp in Sources */, F76C85D61EC4E88300FA49E2 /* FileScanner.cpp in Sources */, C68878F820289B9B0084B384 /* LayDownRollerCoaster.cpp in Sources */, - C68878D820289B9B0084B384 /* SmallScenery.cpp in Sources */, C6887856202899FA0084B384 /* Scenery.cpp in Sources */, C688785D20289A0A0084B384 /* Footpath.cpp in Sources */, F76C85D91EC4E88300FA49E2 /* Guard.cpp in Sources */, @@ -3745,11 +3750,10 @@ C6887850202899D40084B384 /* Cheats.cpp in Sources */, C688784D202899C40084B384 /* Diagnostic.cpp in Sources */, C688787020289A6F0084B384 /* VehiclePaint.cpp in Sources */, + 93F76F0320BFF77B00D4512C /* Paint.SmallScenery.cpp in Sources */, F76C85DD1EC4E88300FA49E2 /* Json.cpp in Sources */, C688793120289B9B0084B384 /* RiverRapids.cpp in Sources */, - C68878D920289B9B0084B384 /* Surface.cpp in Sources */, F76C85E11EC4E88300FA49E2 /* MemoryStream.cpp in Sources */, - C68878D420289B9B0084B384 /* Entrance.cpp in Sources */, F76C85E41EC4E88300FA49E2 /* Path.cpp in Sources */, F76C85E71EC4E88300FA49E2 /* String.cpp in Sources */, C68878DE20289B9B0084B384 /* Supports.cpp in Sources */, @@ -3767,9 +3771,7 @@ F76C85FF1EC4E88300FA49E2 /* Rain.cpp in Sources */, C688785920289A0A0084B384 /* Banner.cpp in Sources */, C68878EC20289B9B0084B384 /* AirPoweredVerticalCoaster.cpp in Sources */, - F76C86031EC4E88300FA49E2 /* Sprite.cpp in Sources */, C688790B20289B9B0084B384 /* WoodenWildMouse.cpp in Sources */, - F76C86031EC4E88300FA49E2 /* Sprite.cpp in Sources */, C688792320289B9B0084B384 /* MotionSimulator.cpp in Sources */, 93DE9751209C3C1000FB1CC8 /* GameState.cpp in Sources */, C68878EF20289B9B0084B384 /* CompactInvertedCoaster.cpp in Sources */, @@ -3778,6 +3780,7 @@ F76C86071EC4E88300FA49E2 /* FileClassifier.cpp in Sources */, C688786920289A660084B384 /* CableLift.cpp in Sources */, C688790020289B9B0084B384 /* ReverseFreefallCoaster.cpp in Sources */, + 93F76EF620BFF76E00D4512C /* Paint.Sprite.cpp in Sources */, C6607F481FE2B97E00D3FC0D /* Input.cpp in Sources */, F76C86451EC4E88300FA49E2 /* Http.cpp in Sources */, C688789F20289B200084B384 /* Language.cpp in Sources */, @@ -3794,6 +3797,7 @@ F76C86511EC4E88300FA49E2 /* NetworkPacket.cpp in Sources */, F76C86531EC4E88300FA49E2 /* NetworkPlayer.cpp in Sources */, F76C86551EC4E88300FA49E2 /* NetworkServerAdvertiser.cpp in Sources */, + 93F76EFF20BFF77B00D4512C /* Paint.Wall.cpp in Sources */, F76C86581EC4E88300FA49E2 /* NetworkUser.cpp in Sources */, F76C865A1EC4E88300FA49E2 /* ServerList.cpp in Sources */, F76C865C1EC4E88300FA49E2 /* TcpSocket.cpp in Sources */, @@ -3801,11 +3805,10 @@ C68878FD20289B9B0084B384 /* MiniRollerCoaster.cpp in Sources */, F76C865E1EC4E88300FA49E2 /* Twitch.cpp in Sources */, F76C865E1EC4E88300FA49E2 /* Twitch.cpp in Sources */, - C68878D620289B9B0084B384 /* LargeScenery.cpp in Sources */, + 93F76EF520BFF76E00D4512C /* Paint.Peep.cpp in Sources */, C6887857202899FD0084B384 /* Park.cpp in Sources */, F76C86601EC4E88300FA49E2 /* BannerObject.cpp in Sources */, C688792A20289B9B0084B384 /* Lift.cpp in Sources */, - C688788420289ADE0084B384 /* String.cpp in Sources */, F76C86621EC4E88300FA49E2 /* EntranceObject.cpp in Sources */, C688792820289B9B0084B384 /* Twist.cpp in Sources */, C688792D20289B9B0084B384 /* SuspendedMonorail.cpp in Sources */, @@ -3845,6 +3848,7 @@ C688787720289A780084B384 /* Station.cpp in Sources */, C68878DF20289B9B0084B384 /* VirtualFloor.cpp in Sources */, C68878CD20289B9B0084B384 /* DefaultObjects.cpp in Sources */, + 939A359A20C12FC800630B3F /* Paint.Litter.cpp in Sources */, C688788220289ADE0084B384 /* Rect.cpp in Sources */, F76C867B1EC4E88400FA49E2 /* StexObject.cpp in Sources */, 93F9DA3920B46FB800D1BE92 /* ObjectJsonHelpers.cpp in Sources */, @@ -3859,7 +3863,6 @@ F76C867D1EC4E88400FA49E2 /* StringTable.cpp in Sources */, C688791520289B9B0084B384 /* MerryGoRound.cpp in Sources */, F76C867F1EC4E88400FA49E2 /* WallObject.cpp in Sources */, - C68878D520289B9B0084B384 /* Fence.cpp in Sources */, C68878FC20289B9B0084B384 /* MineTrainCoaster.cpp in Sources */, C6887854202899F30084B384 /* SmallScenery.cpp in Sources */, C68878DB20289B9B0084B384 /* Paint.cpp in Sources */, @@ -3869,7 +3872,7 @@ C688788320289ADE0084B384 /* ScrollingText.cpp in Sources */, C68878F720289B9B0084B384 /* JuniorRollerCoaster.cpp in Sources */, C688792020289B9B0084B384 /* GoKarts.cpp in Sources */, - C68878D020289B9B0084B384 /* Misc.cpp in Sources */, + 939A359B20C12FC800630B3F /* Paint.Misc.cpp in Sources */, C688792E20289B9B0084B384 /* BoatHire.cpp in Sources */, F76C869C1EC4E88400FA49E2 /* ParkImporter.cpp in Sources */, F76C86A31EC4E88400FA49E2 /* Crash.cpp in Sources */, @@ -3880,11 +3883,11 @@ C688786720289A4A0084B384 /* SawyerCoding.cpp in Sources */, F76C86A61EC4E88400FA49E2 /* macos.mm in Sources */, 93F9DA3B20B4701100D1BE92 /* StdInOutConsole.cpp in Sources */, + 93F76F0520BFF77B00D4512C /* Paint.TileElement.cpp in Sources */, C68878FE20289B9B0084B384 /* MiniSuspendedCoaster.cpp in Sources */, F76C86AD1EC4E88400FA49E2 /* PlatformEnvironment.cpp in Sources */, C688791220289B9B0084B384 /* GhostTrain.cpp in Sources */, C688787F20289ADE0084B384 /* Font.cpp in Sources */, - C68878CF20289B9B0084B384 /* Litter.cpp in Sources */, 93CBA4C520A7502E00867D56 /* Imaging.cpp in Sources */, F76C86AF1EC4E88400FA49E2 /* S4Importer.cpp in Sources */, F76C86B01EC4E88400FA49E2 /* Tables.cpp in Sources */, @@ -3898,17 +3901,15 @@ C688784E202899CB0084B384 /* Date.cpp in Sources */, F76C86BA1EC4E88400FA49E2 /* SawyerEncoding.cpp in Sources */, F76C86C31EC4E88400FA49E2 /* S6Exporter.cpp in Sources */, - C68878D220289B9B0084B384 /* Sprite.cpp in Sources */, C68878E820289B9B0084B384 /* Platform.Win32.cpp in Sources */, C688791A20289B9B0084B384 /* SpaceRings.cpp in Sources */, C688790420289B9B0084B384 /* Steeplechase.cpp in Sources */, C68878E020289B9B0084B384 /* Peep.cpp in Sources */, - C68878DA20289B9B0084B384 /* TileElement.cpp in Sources */, F76C86C51EC4E88400FA49E2 /* S6Importer.cpp in Sources */, C688790A20289B9B0084B384 /* WoodenRollerCoaster.cpp in Sources */, C688787220289A780084B384 /* MusicList.cpp in Sources */, + 93F76F0220BFF77B00D4512C /* Paint.Surface.cpp in Sources */, C6352B921F477032006CCEE3 /* GameActionCompat.cpp in Sources */, - C68878D720289B9B0084B384 /* Path.cpp in Sources */, F76C871C1EC4E88400FA49E2 /* TrackDesignRepository.cpp in Sources */, C68878FA20289B9B0084B384 /* LoopingRollerCoaster.cpp in Sources */, C68878A720289B2A0084B384 /* Marketing.cpp in Sources */, @@ -3923,9 +3924,9 @@ C688789720289B140084B384 /* ViewportInteraction.cpp in Sources */, F76C873A1EC4E88400FA49E2 /* TitleSequence.cpp in Sources */, C6887852202899ED0084B384 /* TileInspector.cpp in Sources */, - C68878D320289B9B0084B384 /* Banner.cpp in Sources */, F76C873C1EC4E88400FA49E2 /* TitleSequenceManager.cpp in Sources */, C688793320289B9B0084B384 /* SubmarineRide.cpp in Sources */, + 93F76EEE20BFF6F900D4512C /* Drawing.String.cpp in Sources */, C688785C20289A0A0084B384 /* Entrance.cpp in Sources */, C688790E20289B9B0084B384 /* CrookedHouse.cpp in Sources */, C68878F520289B9B0084B384 /* InvertedImpulseCoaster.cpp in Sources */, @@ -3944,9 +3945,10 @@ C688786420289A0A0084B384 /* MoneyEffect.cpp in Sources */, C68878A420289B200084B384 /* UTF8.cpp in Sources */, C688786D20289A6F0084B384 /* TrackPaint.cpp in Sources */, - C68878D120289B9B0084B384 /* Peep.cpp in Sources */, + 93F76F0620BFF77B00D4512C /* Paint.Entrance.cpp in Sources */, C688792120289B9B0084B384 /* LaunchedFreefall.cpp in Sources */, C688791920289B9B0084B384 /* ObservationTower.cpp in Sources */, + 93F76EF020BFF71700D4512C /* InteractiveConsole.cpp in Sources */, C6352B901F477032006CCEE3 /* GameAction.cpp in Sources */, C6887853202899F00084B384 /* Sprite.cpp in Sources */, C688786F20289A6F0084B384 /* VehicleData.cpp in Sources */, @@ -3954,10 +3956,10 @@ C688785F20289A0A0084B384 /* LargeScenery.cpp in Sources */, C688792C20289B9B0084B384 /* Monorail.cpp in Sources */, C688792220289B9B0084B384 /* MagicCarpet.cpp in Sources */, + 93F76F0120BFF77B00D4512C /* Paint.LargeScenery.cpp in Sources */, C688786B20289A6F0084B384 /* TrackDataOld.cpp in Sources */, C688790720289B9B0084B384 /* VerticalDropRollerCoaster.cpp in Sources */, 93F9DA3A20B46FCA00D1BE92 /* SceneryObject.cpp in Sources */, - C688789D20289B200084B384 /* Date.cpp in Sources */, C688787520289A780084B384 /* RideData.cpp in Sources */, C688789B20289B200084B384 /* Convert.cpp in Sources */, C688791F20289B9B0084B384 /* Enterprise.cpp in Sources */, @@ -3977,7 +3979,6 @@ 93CBA4CB20A7504500867D56 /* ImageImporter.cpp in Sources */, 9346F9DD208A191900C77D91 /* GuestPathfinding.cpp in Sources */, 9346F9DA208A191900C77D91 /* Guest.cpp in Sources */, - 93DE9752209C3C1000FB1CC8 /* GameState.cpp in Sources */, F7D7749E1EC6713200BE6EBC /* Cli.cpp in Sources */, 93CBA4C620A7502E00867D56 /* Imaging.cpp in Sources */, 9308DA03209908090079EE96 /* Surface.cpp in Sources */,