From 92f6ac73330e949080b0b316e913ef785d9dae9d Mon Sep 17 00:00:00 2001 From: Ted John Date: Thu, 31 May 2018 23:16:53 +0100 Subject: [PATCH] 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