From 3dcbebcf68fc28632df46b51d4aadeeb82b860e1 Mon Sep 17 00:00:00 2001 From: Ted John Date: Fri, 5 Jan 2018 21:17:33 +0000 Subject: [PATCH] Refactor drawing.c to C++ --- .../drawing/engines/opengl/OpenGLDrawingEngine.cpp | 2 +- src/openrct2-ui/drawing/engines/opengl/OpenGLFramebuffer.h | 2 +- src/openrct2-ui/drawing/engines/opengl/TextureCache.cpp | 2 +- src/openrct2-ui/interface/Graph.h | 2 +- src/openrct2-ui/windows/MazeConstruction.cpp | 2 +- src/openrct2-ui/windows/StaffList.cpp | 2 +- src/openrct2/CmdlineSprite.cpp | 2 +- src/openrct2/Imaging.h | 2 +- src/openrct2/Intro.cpp | 2 +- src/openrct2/Intro.h | 2 +- src/openrct2/drawing/{drawing.c => Drawing.cpp} | 7 ++++++- src/openrct2/drawing/{drawing.h => Drawing.h} | 0 src/openrct2/drawing/DrawingFast.cpp | 2 +- src/openrct2/drawing/Font.cpp | 2 +- src/openrct2/drawing/IDrawingContext.h | 2 +- src/openrct2/drawing/Image.cpp | 2 +- src/openrct2/drawing/LightFX.cpp | 2 +- src/openrct2/drawing/LightFX.h | 2 +- src/openrct2/drawing/Line.cpp | 2 +- src/openrct2/drawing/NewDrawing.cpp | 2 +- src/openrct2/drawing/Rain.cpp | 2 +- src/openrct2/drawing/Rect.cpp | 2 +- src/openrct2/drawing/SSE41Drawing.cpp | 2 +- src/openrct2/drawing/ScrollingText.cpp | 2 +- src/openrct2/drawing/Sprite.cpp | 2 +- src/openrct2/drawing/Text.h | 2 +- src/openrct2/drawing/X8DrawingEngine.cpp | 2 +- src/openrct2/interface/Fonts.cpp | 2 +- src/openrct2/interface/Screenshot.cpp | 2 +- src/openrct2/interface/chat.h | 2 +- src/openrct2/interface/colour.c | 2 +- src/openrct2/interface/console.c | 2 +- src/openrct2/interface/console.h | 2 +- src/openrct2/interface/viewport.c | 2 +- src/openrct2/interface/widget.c | 2 +- src/openrct2/interface/window.c | 2 +- src/openrct2/interface/window.h | 2 +- src/openrct2/network/Twitch.cpp | 2 +- src/openrct2/object/BannerObject.cpp | 2 +- src/openrct2/object/EntranceObject.cpp | 2 +- src/openrct2/object/FootpathItemObject.cpp | 2 +- src/openrct2/object/FootpathObject.cpp | 2 +- src/openrct2/object/ImageTable.h | 2 +- src/openrct2/object/LargeSceneryObject.cpp | 2 +- src/openrct2/object/RideObject.cpp | 2 +- src/openrct2/object/SceneryGroupObject.cpp | 2 +- src/openrct2/object/SmallSceneryObject.cpp | 2 +- src/openrct2/object/WallObject.cpp | 2 +- src/openrct2/paint/Paint.cpp | 2 +- src/openrct2/paint/Paint.h | 2 +- src/openrct2/paint/Painter.cpp | 2 +- src/openrct2/paint/sprite/Misc.cpp | 2 +- src/openrct2/paint/sprite/Sprite.cpp | 2 +- src/openrct2/paint/tile_element/Fence.cpp | 2 +- src/openrct2/paint/tile_element/TileElement.cpp | 2 +- src/openrct2/platform/shared.c | 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.cpp | 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/VerticalDropRollerCoaster.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/track_paint.c | 2 +- src/openrct2/ride/transport/SuspendedMonorail.cpp | 2 +- src/openrct2/ride/vehicle_paint.c | 2 +- src/openrct2/title/TitleScreen.cpp | 2 +- src/openrct2/title/TitleScreen.h | 2 +- src/openrct2/world/Climate.cpp | 2 +- src/openrct2/world/Climate.h | 2 +- test/testpaint/TestPaint.hpp | 2 +- test/testpaint/generate.cpp | 2 +- 96 files changed, 100 insertions(+), 95 deletions(-) rename src/openrct2/drawing/{drawing.c => Drawing.cpp} (99%) rename src/openrct2/drawing/{drawing.h => Drawing.h} (100%) diff --git a/src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp b/src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp index 5880c71de1..bb701684db 100644 --- a/src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp +++ b/src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp @@ -32,7 +32,7 @@ #include #include -#include +#include #include #include "../DrawingEngines.h" diff --git a/src/openrct2-ui/drawing/engines/opengl/OpenGLFramebuffer.h b/src/openrct2-ui/drawing/engines/opengl/OpenGLFramebuffer.h index c81e59c71f..4fdc6bbbb5 100644 --- a/src/openrct2-ui/drawing/engines/opengl/OpenGLFramebuffer.h +++ b/src/openrct2-ui/drawing/engines/opengl/OpenGLFramebuffer.h @@ -17,7 +17,7 @@ #pragma once #include -#include +#include #include "OpenGLAPI.h" #include diff --git a/src/openrct2-ui/drawing/engines/opengl/TextureCache.cpp b/src/openrct2-ui/drawing/engines/opengl/TextureCache.cpp index df14fed259..cf3cc5b1ec 100644 --- a/src/openrct2-ui/drawing/engines/opengl/TextureCache.cpp +++ b/src/openrct2-ui/drawing/engines/opengl/TextureCache.cpp @@ -21,7 +21,7 @@ #include #include "TextureCache.h" -#include +#include TextureCache::~TextureCache() { diff --git a/src/openrct2-ui/interface/Graph.h b/src/openrct2-ui/interface/Graph.h index 42fdc7c1fb..53b73e486d 100644 --- a/src/openrct2-ui/interface/Graph.h +++ b/src/openrct2-ui/interface/Graph.h @@ -18,7 +18,7 @@ #define _GRAPH_H_ #include -#include +#include void graph_draw_uint8(rct_drawpixelinfo *dpi, uint8 *history, sint32 count, sint32 baseX, sint32 baseY); void graph_draw_money32(rct_drawpixelinfo *dpi, money32 *history, sint32 count, sint32 baseX, sint32 baseY, sint32 modifier, sint32 offset); diff --git a/src/openrct2-ui/windows/MazeConstruction.cpp b/src/openrct2-ui/windows/MazeConstruction.cpp index 4f7c9fb152..6aec934818 100644 --- a/src/openrct2-ui/windows/MazeConstruction.cpp +++ b/src/openrct2-ui/windows/MazeConstruction.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/StaffList.cpp b/src/openrct2-ui/windows/StaffList.cpp index f9d6cca466..40170d6a67 100644 --- a/src/openrct2-ui/windows/StaffList.cpp +++ b/src/openrct2-ui/windows/StaffList.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/openrct2/CmdlineSprite.cpp b/src/openrct2/CmdlineSprite.cpp index 76ec7f450a..bf3091bf2a 100644 --- a/src/openrct2/CmdlineSprite.cpp +++ b/src/openrct2/CmdlineSprite.cpp @@ -18,7 +18,7 @@ #include #include "CmdlineSprite.h" -#include "drawing/drawing.h" +#include "drawing/Drawing.h" #include "Imaging.h" #include "localisation/localisation.h" #include "OpenRCT2.h" diff --git a/src/openrct2/Imaging.h b/src/openrct2/Imaging.h index 9f441cc472..41cdbd90d0 100644 --- a/src/openrct2/Imaging.h +++ b/src/openrct2/Imaging.h @@ -18,7 +18,7 @@ #include "common.h" -#include "drawing/drawing.h" +#include "drawing/Drawing.h" #ifdef __cplusplus diff --git a/src/openrct2/Intro.cpp b/src/openrct2/Intro.cpp index cf2c17cac0..a34b58cd02 100644 --- a/src/openrct2/Intro.cpp +++ b/src/openrct2/Intro.cpp @@ -17,7 +17,7 @@ #include "audio/audio.h" #include "audio/AudioMixer.h" #include "Context.h" -#include "drawing/drawing.h" +#include "drawing/Drawing.h" #include "Intro.h" #include "sprites.h" diff --git a/src/openrct2/Intro.h b/src/openrct2/Intro.h index f18d96b693..a324882a5a 100644 --- a/src/openrct2/Intro.h +++ b/src/openrct2/Intro.h @@ -17,7 +17,7 @@ #ifndef _INTRO_H_ #define _INTRO_H_ -#include "drawing/drawing.h" +#include "drawing/Drawing.h" enum INTRO_STATE { INTRO_STATE_NONE, diff --git a/src/openrct2/drawing/drawing.c b/src/openrct2/drawing/Drawing.cpp similarity index 99% rename from src/openrct2/drawing/drawing.c rename to src/openrct2/drawing/Drawing.cpp index f6c4a66812..1204e85bc2 100644 --- a/src/openrct2/drawing/drawing.c +++ b/src/openrct2/drawing/Drawing.cpp @@ -24,7 +24,10 @@ #include "../platform/platform.h" #include "../util/Util.h" #include "../world/water.h" -#include "drawing.h" +#include "Drawing.h" + +extern "C" +{ // HACK These were originally passed back through registers sint32 gLastDrawStringX; @@ -654,3 +657,5 @@ void gfx_draw_pickedup_peep(rct_drawpixelinfo *dpi) gfx_draw_sprite(dpi, gPickupPeepImage, gPickupPeepX, gPickupPeepY, 0); } } + +} diff --git a/src/openrct2/drawing/drawing.h b/src/openrct2/drawing/Drawing.h similarity index 100% rename from src/openrct2/drawing/drawing.h rename to src/openrct2/drawing/Drawing.h diff --git a/src/openrct2/drawing/DrawingFast.cpp b/src/openrct2/drawing/DrawingFast.cpp index 8f9437fad1..fc66358ac9 100644 --- a/src/openrct2/drawing/DrawingFast.cpp +++ b/src/openrct2/drawing/DrawingFast.cpp @@ -16,7 +16,7 @@ #pragma warning(disable : 4127) // conditional expression is constant -#include "drawing.h" +#include "Drawing.h" template static void FASTCALL DrawRLESprite2(const uint8* RESTRICT source_bits_pointer, diff --git a/src/openrct2/drawing/Font.cpp b/src/openrct2/drawing/Font.cpp index e5cd4b3ce1..cf29dbb9f3 100644 --- a/src/openrct2/drawing/Font.cpp +++ b/src/openrct2/drawing/Font.cpp @@ -18,7 +18,7 @@ #include "../core/Util.hpp" #include "../localisation/localisation.h" #include "../sprites.h" -#include "drawing.h" +#include "Drawing.h" #include "Font.h" #include "TTF.h" diff --git a/src/openrct2/drawing/IDrawingContext.h b/src/openrct2/drawing/IDrawingContext.h index 40640b5b5b..376e1df851 100644 --- a/src/openrct2/drawing/IDrawingContext.h +++ b/src/openrct2/drawing/IDrawingContext.h @@ -20,7 +20,7 @@ #include "../common.h" -#include "drawing.h" +#include "Drawing.h" namespace OpenRCT2 { namespace Drawing { diff --git a/src/openrct2/drawing/Image.cpp b/src/openrct2/drawing/Image.cpp index 199641e914..f6e6971e2a 100644 --- a/src/openrct2/drawing/Image.cpp +++ b/src/openrct2/drawing/Image.cpp @@ -20,7 +20,7 @@ #include "../core/Guard.hpp" #include "../OpenRCT2.h" -#include "drawing.h" +#include "Drawing.h" constexpr uint32 BASE_IMAGE_ID = 29294; constexpr uint32 MAX_IMAGES = 262144; diff --git a/src/openrct2/drawing/LightFX.cpp b/src/openrct2/drawing/LightFX.cpp index ba4adf82a5..3f61f3f62a 100644 --- a/src/openrct2/drawing/LightFX.cpp +++ b/src/openrct2/drawing/LightFX.cpp @@ -25,7 +25,7 @@ #include "../paint/tile_element/TileElement.h" #include "../util/Util.h" #include "../world/Climate.h" -#include "drawing.h" +#include "Drawing.h" #include "LightFX.h" extern "C" diff --git a/src/openrct2/drawing/LightFX.h b/src/openrct2/drawing/LightFX.h index 4ee1770fad..91e8bf8406 100644 --- a/src/openrct2/drawing/LightFX.h +++ b/src/openrct2/drawing/LightFX.h @@ -21,7 +21,7 @@ #include "../common.h" #include "../world/Map.h" -#include "drawing.h" +#include "Drawing.h" enum LIGHTFX_LIGHT_TYPE { LIGHTFX_LIGHT_TYPE_NONE = 0, diff --git a/src/openrct2/drawing/Line.cpp b/src/openrct2/drawing/Line.cpp index f99d8bd0cf..ea080192b8 100644 --- a/src/openrct2/drawing/Line.cpp +++ b/src/openrct2/drawing/Line.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "drawing.h" +#include "Drawing.h" extern "C" { diff --git a/src/openrct2/drawing/NewDrawing.cpp b/src/openrct2/drawing/NewDrawing.cpp index 347704b860..c514fc84ae 100644 --- a/src/openrct2/drawing/NewDrawing.cpp +++ b/src/openrct2/drawing/NewDrawing.cpp @@ -24,7 +24,7 @@ #include "NewDrawing.h" #include "../config/Config.h" -#include "../drawing/drawing.h" +#include "../drawing/Drawing.h" #include "../localisation/string_ids.h" #include "../platform/platform.h" diff --git a/src/openrct2/drawing/Rain.cpp b/src/openrct2/drawing/Rain.cpp index 530d02a2db..10a5f62f0f 100644 --- a/src/openrct2/drawing/Rain.cpp +++ b/src/openrct2/drawing/Rain.cpp @@ -16,7 +16,7 @@ #include "../interface/window.h" #include "../world/Climate.h" -#include "drawing.h" +#include "Drawing.h" #include "../config/Config.h" #include "IDrawingEngine.h" diff --git a/src/openrct2/drawing/Rect.cpp b/src/openrct2/drawing/Rect.cpp index cae3a126f7..dd723de7d5 100644 --- a/src/openrct2/drawing/Rect.cpp +++ b/src/openrct2/drawing/Rect.cpp @@ -17,7 +17,7 @@ #include "../common.h" #include "../interface/colour.h" #include "../platform/platform.h" -#include "drawing.h" +#include "Drawing.h" extern "C" { diff --git a/src/openrct2/drawing/SSE41Drawing.cpp b/src/openrct2/drawing/SSE41Drawing.cpp index ac31974945..8321afaf54 100644 --- a/src/openrct2/drawing/SSE41Drawing.cpp +++ b/src/openrct2/drawing/SSE41Drawing.cpp @@ -16,7 +16,7 @@ #include "../common.h" #include "../core/Guard.hpp" -#include "drawing.h" +#include "Drawing.h" #ifdef __SSE4_1__ diff --git a/src/openrct2/drawing/ScrollingText.cpp b/src/openrct2/drawing/ScrollingText.cpp index 43288f5711..7876be66c6 100644 --- a/src/openrct2/drawing/ScrollingText.cpp +++ b/src/openrct2/drawing/ScrollingText.cpp @@ -20,7 +20,7 @@ #include "../localisation/localisation.h" #include "../paint/Paint.h" #include "../sprites.h" -#include "drawing.h" +#include "Drawing.h" #include "TTF.h" #pragma pack(push, 1) diff --git a/src/openrct2/drawing/Sprite.cpp b/src/openrct2/drawing/Sprite.cpp index 9770497b7d..fb822773c6 100644 --- a/src/openrct2/drawing/Sprite.cpp +++ b/src/openrct2/drawing/Sprite.cpp @@ -29,7 +29,7 @@ #include "../platform/platform.h" #include "../util/Util.h" -#include "drawing.h" +#include "Drawing.h" using namespace OpenRCT2; using namespace OpenRCT2::Ui; diff --git a/src/openrct2/drawing/Text.h b/src/openrct2/drawing/Text.h index c971c9ab0f..9ba102471e 100644 --- a/src/openrct2/drawing/Text.h +++ b/src/openrct2/drawing/Text.h @@ -17,7 +17,7 @@ #pragma once #include "../common.h" -#include "drawing.h" +#include "Drawing.h" enum class TextAlignment { diff --git a/src/openrct2/drawing/X8DrawingEngine.cpp b/src/openrct2/drawing/X8DrawingEngine.cpp index 338904df79..6aad5dc2c2 100644 --- a/src/openrct2/drawing/X8DrawingEngine.cpp +++ b/src/openrct2/drawing/X8DrawingEngine.cpp @@ -30,7 +30,7 @@ #include "../interface/viewport.h" #include "../interface/window.h" #include "../Intro.h" -#include "drawing.h" +#include "Drawing.h" #include "LightFX.h" using namespace OpenRCT2; diff --git a/src/openrct2/interface/Fonts.cpp b/src/openrct2/interface/Fonts.cpp index b806c22110..7c409ebb18 100644 --- a/src/openrct2/interface/Fonts.cpp +++ b/src/openrct2/interface/Fonts.cpp @@ -21,7 +21,7 @@ #include "Fonts.h" #include "FontFamilies.h" -#include "../drawing/drawing.h" +#include "../drawing/Drawing.h" #include "../drawing/TTF.h" #include "../localisation/language.h" diff --git a/src/openrct2/interface/Screenshot.cpp b/src/openrct2/interface/Screenshot.cpp index 3e938cfedc..49005c1ae3 100644 --- a/src/openrct2/interface/Screenshot.cpp +++ b/src/openrct2/interface/Screenshot.cpp @@ -23,7 +23,7 @@ #include "../OpenRCT2.h" #include "Screenshot.h" -#include "../drawing/drawing.h" +#include "../drawing/Drawing.h" #include "../Game.h" #include "../Intro.h" #include "../localisation/localisation.h" diff --git a/src/openrct2/interface/chat.h b/src/openrct2/interface/chat.h index b0d66241d9..3272b3fe2f 100644 --- a/src/openrct2/interface/chat.h +++ b/src/openrct2/interface/chat.h @@ -18,7 +18,7 @@ #define _CHAT_H_ #include "../common.h" -#include "../drawing/drawing.h" +#include "../drawing/Drawing.h" #define CHAT_HISTORY_SIZE 10 #define CHAT_INPUT_SIZE 1024 diff --git a/src/openrct2/interface/colour.c b/src/openrct2/interface/colour.c index 863a7e7e8f..bc36d6d7b1 100644 --- a/src/openrct2/interface/colour.c +++ b/src/openrct2/interface/colour.c @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../drawing/drawing.h" +#include "../drawing/Drawing.h" #include "colour.h" #include "../sprites.h" diff --git a/src/openrct2/interface/console.c b/src/openrct2/interface/console.c index 71efd82c0e..5121f5f0c2 100644 --- a/src/openrct2/interface/console.c +++ b/src/openrct2/interface/console.c @@ -18,7 +18,7 @@ #include "../config/Config.h" #include "../Context.h" -#include "../drawing/drawing.h" +#include "../drawing/Drawing.h" #include "../Editor.h" #include "../EditorObjectSelectionSession.h" #include "../Game.h" diff --git a/src/openrct2/interface/console.h b/src/openrct2/interface/console.h index 76dd0afaec..0a07a4784c 100644 --- a/src/openrct2/interface/console.h +++ b/src/openrct2/interface/console.h @@ -18,7 +18,7 @@ #define _CONSOLE_H_ #include "../common.h" -#include "../drawing/drawing.h" +#include "../drawing/Drawing.h" typedef enum CONSOLE_INPUT { diff --git a/src/openrct2/interface/viewport.c b/src/openrct2/interface/viewport.c index 979c2f9cf1..d88b66f8be 100644 --- a/src/openrct2/interface/viewport.c +++ b/src/openrct2/interface/viewport.c @@ -16,7 +16,7 @@ #include "../config/Config.h" #include "../Context.h" -#include "../drawing/drawing.h" +#include "../drawing/Drawing.h" #include "../Game.h" #include "../Input.h" #include "../localisation/localisation.h" diff --git a/src/openrct2/interface/widget.c b/src/openrct2/interface/widget.c index 40512bc2e3..d65de57af4 100644 --- a/src/openrct2/interface/widget.c +++ b/src/openrct2/interface/widget.c @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../drawing/drawing.h" +#include "../drawing/Drawing.h" #include "../Input.h" #include "../sprites.h" #include "widget.h" diff --git a/src/openrct2/interface/window.c b/src/openrct2/interface/window.c index 2cccb467d3..41c3cb8e77 100644 --- a/src/openrct2/interface/window.c +++ b/src/openrct2/interface/window.c @@ -18,7 +18,7 @@ #include "../config/Config.h" #include "../Context.h" #include "../core/Guard.hpp" -#include "../drawing/drawing.h" +#include "../drawing/Drawing.h" #include "../Editor.h" #include "../Game.h" #include "../Input.h" diff --git a/src/openrct2/interface/window.h b/src/openrct2/interface/window.h index 4c50acbb5a..159a99a55f 100644 --- a/src/openrct2/interface/window.h +++ b/src/openrct2/interface/window.h @@ -18,7 +18,7 @@ #define _WINDOW_H_ #include "../common.h" -#include "../drawing/drawing.h" +#include "../drawing/Drawing.h" #include "../management/Research.h" #include "../peep/Peep.h" #include "../ride/Ride.h" diff --git a/src/openrct2/network/Twitch.cpp b/src/openrct2/network/Twitch.cpp index b80e0cd0d2..4cfaedc240 100644 --- a/src/openrct2/network/Twitch.cpp +++ b/src/openrct2/network/Twitch.cpp @@ -32,7 +32,7 @@ #include "../OpenRCT2.h" #include "../config/Config.h" -#include "../drawing/drawing.h" +#include "../drawing/Drawing.h" #include "../Game.h" #include "../interface/console.h" #include "../localisation/localisation.h" diff --git a/src/openrct2/object/BannerObject.cpp b/src/openrct2/object/BannerObject.cpp index 7acd0bb160..cab5237fbb 100644 --- a/src/openrct2/object/BannerObject.cpp +++ b/src/openrct2/object/BannerObject.cpp @@ -17,7 +17,7 @@ #include "../core/IStream.hpp" #include "BannerObject.h" -#include "../drawing/drawing.h" +#include "../drawing/Drawing.h" #include "../localisation/language.h" #include "../object/Object.h" #include "ObjectList.h" diff --git a/src/openrct2/object/EntranceObject.cpp b/src/openrct2/object/EntranceObject.cpp index a200f105bc..b8ec240a65 100644 --- a/src/openrct2/object/EntranceObject.cpp +++ b/src/openrct2/object/EntranceObject.cpp @@ -18,7 +18,7 @@ #include "../core/String.hpp" #include "EntranceObject.h" -#include "../drawing/drawing.h" +#include "../drawing/Drawing.h" #include "../localisation/localisation.h" void EntranceObject::ReadLegacy(IReadObjectContext * context, IStream * stream) diff --git a/src/openrct2/object/FootpathItemObject.cpp b/src/openrct2/object/FootpathItemObject.cpp index 2bfb4f4f7e..fdddff4536 100644 --- a/src/openrct2/object/FootpathItemObject.cpp +++ b/src/openrct2/object/FootpathItemObject.cpp @@ -17,7 +17,7 @@ #include "../core/IStream.hpp" #include "FootpathItemObject.h" -#include "../drawing/drawing.h" +#include "../drawing/Drawing.h" #include "../localisation/localisation.h" #include "../object/Object.h" #include "ObjectList.h" diff --git a/src/openrct2/object/FootpathObject.cpp b/src/openrct2/object/FootpathObject.cpp index c2fc60f1f4..af5b4c4796 100644 --- a/src/openrct2/object/FootpathObject.cpp +++ b/src/openrct2/object/FootpathObject.cpp @@ -17,7 +17,7 @@ #include "../core/IStream.hpp" #include "FootpathObject.h" -#include "../drawing/drawing.h" +#include "../drawing/Drawing.h" #include "../localisation/language.h" #include "../world/footpath.h" diff --git a/src/openrct2/object/ImageTable.h b/src/openrct2/object/ImageTable.h index c4641802ab..8eab59ad1d 100644 --- a/src/openrct2/object/ImageTable.h +++ b/src/openrct2/object/ImageTable.h @@ -21,7 +21,7 @@ #include #include "../common.h" -#include "../drawing/drawing.h" +#include "../drawing/Drawing.h" interface IReadObjectContext; interface IStream; diff --git a/src/openrct2/object/LargeSceneryObject.cpp b/src/openrct2/object/LargeSceneryObject.cpp index cae37f86d0..11496aa9c9 100644 --- a/src/openrct2/object/LargeSceneryObject.cpp +++ b/src/openrct2/object/LargeSceneryObject.cpp @@ -18,7 +18,7 @@ #include "../core/Memory.hpp" #include "LargeSceneryObject.h" -#include "../drawing/drawing.h" +#include "../drawing/Drawing.h" #include "../localisation/language.h" LargeSceneryObject::~LargeSceneryObject() diff --git a/src/openrct2/object/RideObject.cpp b/src/openrct2/object/RideObject.cpp index e2bfb43bd4..561ac650ca 100644 --- a/src/openrct2/object/RideObject.cpp +++ b/src/openrct2/object/RideObject.cpp @@ -22,7 +22,7 @@ #include "RideObject.h" #include "../ride/RideGroupManager.h" -#include "../drawing/drawing.h" +#include "../drawing/Drawing.h" #include "../localisation/language.h" #include "../rct2.h" #include "../ride/Ride.h" diff --git a/src/openrct2/object/SceneryGroupObject.cpp b/src/openrct2/object/SceneryGroupObject.cpp index dbc05e6843..a5c65881fc 100644 --- a/src/openrct2/object/SceneryGroupObject.cpp +++ b/src/openrct2/object/SceneryGroupObject.cpp @@ -20,7 +20,7 @@ #include "ObjectRepository.h" #include "SceneryGroupObject.h" -#include "../drawing/drawing.h" +#include "../drawing/Drawing.h" #include "../localisation/language.h" SceneryGroupObject::~SceneryGroupObject() diff --git a/src/openrct2/object/SmallSceneryObject.cpp b/src/openrct2/object/SmallSceneryObject.cpp index 2836d9ca73..634d0c8163 100644 --- a/src/openrct2/object/SmallSceneryObject.cpp +++ b/src/openrct2/object/SmallSceneryObject.cpp @@ -20,7 +20,7 @@ #include "../core/String.hpp" #include "SmallSceneryObject.h" -#include "../drawing/drawing.h" +#include "../drawing/Drawing.h" #include "../localisation/language.h" #include "../world/scenery.h" #include "../world/SmallScenery.h" diff --git a/src/openrct2/object/WallObject.cpp b/src/openrct2/object/WallObject.cpp index e6fd27a070..80dd746cea 100644 --- a/src/openrct2/object/WallObject.cpp +++ b/src/openrct2/object/WallObject.cpp @@ -17,7 +17,7 @@ #include "../core/IStream.hpp" #include "WallObject.h" -#include "../drawing/drawing.h" +#include "../drawing/Drawing.h" #include "../localisation/language.h" void WallObject::ReadLegacy(IReadObjectContext * context, IStream * stream) diff --git a/src/openrct2/paint/Paint.cpp b/src/openrct2/paint/Paint.cpp index 53c4b0ab62..3158115410 100644 --- a/src/openrct2/paint/Paint.cpp +++ b/src/openrct2/paint/Paint.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "Paint.h" -#include "../drawing/drawing.h" +#include "../drawing/Drawing.h" #include "../localisation/localisation.h" #include "../config/Config.h" #include "../interface/viewport.h" diff --git a/src/openrct2/paint/Paint.h b/src/openrct2/paint/Paint.h index f08e6d7502..60f9efa14f 100644 --- a/src/openrct2/paint/Paint.h +++ b/src/openrct2/paint/Paint.h @@ -19,7 +19,7 @@ #include "../common.h" #include "../world/Map.h" #include "../interface/colour.h" -#include "../drawing/drawing.h" +#include "../drawing/Drawing.h" typedef struct attached_paint_struct attached_paint_struct; typedef struct paint_struct paint_struct; diff --git a/src/openrct2/paint/Painter.cpp b/src/openrct2/paint/Painter.cpp index 13fa5e7fd9..2f81b4fdc0 100644 --- a/src/openrct2/paint/Painter.cpp +++ b/src/openrct2/paint/Painter.cpp @@ -21,7 +21,7 @@ #include "../ui/UiContext.h" #include "Painter.h" -#include "../drawing/drawing.h" +#include "../drawing/Drawing.h" #include "../Game.h" #include "../interface/chat.h" #include "../interface/console.h" diff --git a/src/openrct2/paint/sprite/Misc.cpp b/src/openrct2/paint/sprite/Misc.cpp index 0df9ffb28f..f291e65bbb 100644 --- a/src/openrct2/paint/sprite/Misc.cpp +++ b/src/openrct2/paint/sprite/Misc.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "../../world/sprite.h" -#include "../../drawing/drawing.h" +#include "../../drawing/Drawing.h" #include "../../interface/viewport.h" #include "Sprite.h" #include "../Paint.h" diff --git a/src/openrct2/paint/sprite/Sprite.cpp b/src/openrct2/paint/sprite/Sprite.cpp index 7a45216a08..5806d53642 100644 --- a/src/openrct2/paint/sprite/Sprite.cpp +++ b/src/openrct2/paint/sprite/Sprite.cpp @@ -16,7 +16,7 @@ #include "Sprite.h" #include "../Paint.h" -#include "../../drawing/drawing.h" +#include "../../drawing/Drawing.h" #include "../../world/sprite.h" #include "../../ride/ride_data.h" #include "../../interface/viewport.h" diff --git a/src/openrct2/paint/tile_element/Fence.cpp b/src/openrct2/paint/tile_element/Fence.cpp index 1b5f13b53a..a86735119b 100644 --- a/src/openrct2/paint/tile_element/Fence.cpp +++ b/src/openrct2/paint/tile_element/Fence.cpp @@ -16,7 +16,7 @@ #include "../../common.h" #include "../../config/Config.h" -#include "../../drawing/drawing.h" +#include "../../drawing/Drawing.h" #include "../../Game.h" #include "../../localisation/localisation.h" #include "../../interface/colour.h" diff --git a/src/openrct2/paint/tile_element/TileElement.cpp b/src/openrct2/paint/tile_element/TileElement.cpp index 7a11eee400..eb8474dbff 100644 --- a/src/openrct2/paint/tile_element/TileElement.cpp +++ b/src/openrct2/paint/tile_element/TileElement.cpp @@ -16,7 +16,7 @@ #include "../../config/Config.h" #include "../../core/Math.hpp" -#include "../../drawing/drawing.h" +#include "../../drawing/Drawing.h" #include "../../Game.h" #include "../../interface/viewport.h" #include "../../localisation/localisation.h" diff --git a/src/openrct2/platform/shared.c b/src/openrct2/platform/shared.c index e03c15f247..84d702f783 100644 --- a/src/openrct2/platform/shared.c +++ b/src/openrct2/platform/shared.c @@ -28,7 +28,7 @@ #include "../Context.h" #include "../OpenRCT2.h" #include "../config/Config.h" -#include "../drawing/drawing.h" +#include "../drawing/Drawing.h" #include "../drawing/LightFX.h" #include "../Game.h" #include "../localisation/currency.h" diff --git a/src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp b/src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp index 813b56701b..c1c5d66b71 100644 --- a/src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp +++ b/src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../drawing/drawing.h" +#include "../../drawing/Drawing.h" #include "../../interface/viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" diff --git a/src/openrct2/ride/coaster/BobsleighCoaster.cpp b/src/openrct2/ride/coaster/BobsleighCoaster.cpp index d9909f0843..d4ee88daa1 100644 --- a/src/openrct2/ride/coaster/BobsleighCoaster.cpp +++ b/src/openrct2/ride/coaster/BobsleighCoaster.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../drawing/drawing.h" +#include "../../drawing/Drawing.h" #include "../../interface/viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" diff --git a/src/openrct2/ride/coaster/BolligerMabillardTrack.cpp b/src/openrct2/ride/coaster/BolligerMabillardTrack.cpp index 43ec6aa70e..b42e4e60af 100644 --- a/src/openrct2/ride/coaster/BolligerMabillardTrack.cpp +++ b/src/openrct2/ride/coaster/BolligerMabillardTrack.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../drawing/drawing.h" +#include "../../drawing/Drawing.h" #include "../../interface/viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" diff --git a/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp b/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp index 3542aae544..a17bd7fdc0 100644 --- a/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp +++ b/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../drawing/drawing.h" +#include "../../drawing/Drawing.h" #include "../../interface/viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" diff --git a/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp b/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp index 087a0c0a9d..84cb12cf49 100644 --- a/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../drawing/drawing.h" +#include "../../drawing/Drawing.h" #include "../../interface/viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" diff --git a/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp b/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp index 4a6a536bd8..486c95153e 100644 --- a/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../drawing/drawing.h" +#include "../../drawing/Drawing.h" #include "../../interface/viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" diff --git a/src/openrct2/ride/coaster/GigaCoaster.cpp b/src/openrct2/ride/coaster/GigaCoaster.cpp index 2e0a42fc43..39344d8eb0 100644 --- a/src/openrct2/ride/coaster/GigaCoaster.cpp +++ b/src/openrct2/ride/coaster/GigaCoaster.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../drawing/drawing.h" +#include "../../drawing/Drawing.h" #include "../../interface/viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" diff --git a/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp b/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp index 3565eb3d19..4bdc97a185 100644 --- a/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp +++ b/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../drawing/drawing.h" +#include "../../drawing/Drawing.h" #include "../../interface/viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" diff --git a/src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp b/src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp index 417d5dd348..900a2178bd 100644 --- a/src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp +++ b/src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../drawing/drawing.h" +#include "../../drawing/Drawing.h" #include "../../interface/viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" diff --git a/src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp b/src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp index b9b6edbfb3..60ba71fab5 100644 --- a/src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp +++ b/src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../drawing/drawing.h" +#include "../../drawing/Drawing.h" #include "../../interface/viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" diff --git a/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp b/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp index 4d0396da86..94b273dbcc 100644 --- a/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../drawing/drawing.h" +#include "../../drawing/Drawing.h" #include "../../interface/viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" diff --git a/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp b/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp index 8de76152a5..e5f9526c50 100644 --- a/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "../../core/Math.hpp" -#include "../../drawing/drawing.h" +#include "../../drawing/Drawing.h" #include "../../interface/viewport.h" #include "../../interface/window.h" #include "../../localisation/localisation.h" diff --git a/src/openrct2/ride/coaster/LayDownRollerCoaster.cpp b/src/openrct2/ride/coaster/LayDownRollerCoaster.cpp index 594922d370..bbe3467c8e 100644 --- a/src/openrct2/ride/coaster/LayDownRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/LayDownRollerCoaster.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../drawing/drawing.h" +#include "../../drawing/Drawing.h" #include "../../interface/viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" diff --git a/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp b/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp index ffe7a4d64b..52ce71e45e 100644 --- a/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../drawing/drawing.h" +#include "../../drawing/Drawing.h" #include "../../interface/viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" diff --git a/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp b/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp index da867daeab..cbe44695a8 100644 --- a/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../drawing/drawing.h" +#include "../../drawing/Drawing.h" #include "../../interface/viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" diff --git a/src/openrct2/ride/coaster/MineRide.cpp b/src/openrct2/ride/coaster/MineRide.cpp index d7d796c455..a4e1fe20f0 100644 --- a/src/openrct2/ride/coaster/MineRide.cpp +++ b/src/openrct2/ride/coaster/MineRide.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../drawing/drawing.h" +#include "../../drawing/Drawing.h" #include "../../interface/viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" diff --git a/src/openrct2/ride/coaster/MineTrainCoaster.cpp b/src/openrct2/ride/coaster/MineTrainCoaster.cpp index 22844467ee..39f15d4380 100644 --- a/src/openrct2/ride/coaster/MineTrainCoaster.cpp +++ b/src/openrct2/ride/coaster/MineTrainCoaster.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../drawing/drawing.h" +#include "../../drawing/Drawing.h" #include "../../interface/viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" diff --git a/src/openrct2/ride/coaster/MiniRollerCoaster.cpp b/src/openrct2/ride/coaster/MiniRollerCoaster.cpp index cefdcdc917..50a84e4943 100644 --- a/src/openrct2/ride/coaster/MiniRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/MiniRollerCoaster.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../drawing/drawing.h" +#include "../../drawing/Drawing.h" #include "../../interface/viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" diff --git a/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp b/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp index cf9c2fe770..c5cf0e99ff 100644 --- a/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp +++ b/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../drawing/drawing.h" +#include "../../drawing/Drawing.h" #include "../../interface/viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" diff --git a/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp b/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp index 440df9261e..73e539b37c 100644 --- a/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../drawing/drawing.h" +#include "../../drawing/Drawing.h" #include "../../interface/viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" diff --git a/src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp b/src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp index 8fbfde8531..1048833946 100644 --- a/src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp +++ b/src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../drawing/drawing.h" +#include "../../drawing/Drawing.h" #include "../../interface/viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" diff --git a/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp b/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp index 90d33cd1a1..8436b6af24 100644 --- a/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../drawing/drawing.h" +#include "../../drawing/Drawing.h" #include "../../interface/viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" diff --git a/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp b/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp index cc69d3a3dd..8954f52dd0 100644 --- a/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../drawing/drawing.h" +#include "../../drawing/Drawing.h" #include "../../interface/viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" diff --git a/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp b/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp index 7c259318c2..f6f8942ecd 100644 --- a/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../drawing/drawing.h" +#include "../../drawing/Drawing.h" #include "../../interface/viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" diff --git a/src/openrct2/ride/coaster/Steeplechase.cpp b/src/openrct2/ride/coaster/Steeplechase.cpp index f84022fcbb..3b8da1a4d9 100644 --- a/src/openrct2/ride/coaster/Steeplechase.cpp +++ b/src/openrct2/ride/coaster/Steeplechase.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../drawing/drawing.h" +#include "../../drawing/Drawing.h" #include "../../interface/viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" diff --git a/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp b/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp index acfc93b143..371028fdc4 100644 --- a/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp +++ b/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../drawing/drawing.h" +#include "../../drawing/Drawing.h" #include "../../interface/viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" diff --git a/src/openrct2/ride/coaster/TwisterRollerCoaster.cpp b/src/openrct2/ride/coaster/TwisterRollerCoaster.cpp index 012e1188fa..d6cd50c034 100644 --- a/src/openrct2/ride/coaster/TwisterRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/TwisterRollerCoaster.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../drawing/drawing.h" +#include "../../drawing/Drawing.h" #include "../../interface/viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" diff --git a/src/openrct2/ride/coaster/VerticalDropRollerCoaster.cpp b/src/openrct2/ride/coaster/VerticalDropRollerCoaster.cpp index 622dc4cd81..e5eedcfb3b 100644 --- a/src/openrct2/ride/coaster/VerticalDropRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/VerticalDropRollerCoaster.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../drawing/drawing.h" +#include "../../drawing/Drawing.h" #include "../../paint/Supports.h" #include "../TrackData.h" #include "BolligerMabillardTrack.h" diff --git a/src/openrct2/ride/coaster/WildMouse.cpp b/src/openrct2/ride/coaster/WildMouse.cpp index 6db9c7b735..32e3025c0d 100644 --- a/src/openrct2/ride/coaster/WildMouse.cpp +++ b/src/openrct2/ride/coaster/WildMouse.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../drawing/drawing.h" +#include "../../drawing/Drawing.h" #include "../../interface/viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" diff --git a/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp b/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp index a93592a8b6..141fc3b1f4 100644 --- a/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../drawing/drawing.h" +#include "../../drawing/Drawing.h" #include "../../interface/viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" diff --git a/src/openrct2/ride/coaster/WoodenWildMouse.cpp b/src/openrct2/ride/coaster/WoodenWildMouse.cpp index c9daaebd22..b2f9539b2d 100644 --- a/src/openrct2/ride/coaster/WoodenWildMouse.cpp +++ b/src/openrct2/ride/coaster/WoodenWildMouse.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../drawing/drawing.h" +#include "../../drawing/Drawing.h" #include "../../interface/viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" diff --git a/src/openrct2/ride/track_paint.c b/src/openrct2/ride/track_paint.c index f1906dc0ec..c0a4c79bae 100644 --- a/src/openrct2/ride/track_paint.c +++ b/src/openrct2/ride/track_paint.c @@ -15,7 +15,7 @@ #pragma endregion #include "../config/Config.h" -#include "../drawing/drawing.h" +#include "../drawing/Drawing.h" #include "../paint/Supports.h" #include "../interface/viewport.h" #include "../paint/Paint.h" diff --git a/src/openrct2/ride/transport/SuspendedMonorail.cpp b/src/openrct2/ride/transport/SuspendedMonorail.cpp index 6c218e6e8d..9ac4fd6010 100644 --- a/src/openrct2/ride/transport/SuspendedMonorail.cpp +++ b/src/openrct2/ride/transport/SuspendedMonorail.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../drawing/drawing.h" +#include "../../drawing/Drawing.h" #include "../../interface/viewport.h" #include "../../paint/tile_element/TileElement.h" #include "../../paint/Paint.h" diff --git a/src/openrct2/ride/vehicle_paint.c b/src/openrct2/ride/vehicle_paint.c index 9f64f12b81..972f07206f 100644 --- a/src/openrct2/ride/vehicle_paint.c +++ b/src/openrct2/ride/vehicle_paint.c @@ -15,7 +15,7 @@ #pragma endregion #include "../paint/Paint.h" -#include "../drawing/drawing.h" +#include "../drawing/Drawing.h" #include "../world/sprite.h" #include "../ride/ride_data.h" #include "Track.h" diff --git a/src/openrct2/title/TitleScreen.cpp b/src/openrct2/title/TitleScreen.cpp index f833a5bd72..0d3d9a34f1 100644 --- a/src/openrct2/title/TitleScreen.cpp +++ b/src/openrct2/title/TitleScreen.cpp @@ -27,7 +27,7 @@ #include "TitleSequencePlayer.h" #include "../audio/audio.h" -#include "../drawing/drawing.h" +#include "../drawing/Drawing.h" #include "../Game.h" #include "../Input.h" #include "../interface/viewport.h" diff --git a/src/openrct2/title/TitleScreen.h b/src/openrct2/title/TitleScreen.h index 7faf858159..e9f2c5278f 100644 --- a/src/openrct2/title/TitleScreen.h +++ b/src/openrct2/title/TitleScreen.h @@ -18,7 +18,7 @@ #include "../common.h" -#include "../drawing/drawing.h" +#include "../drawing/Drawing.h" #ifdef __cplusplus interface ITitleSequencePlayer; diff --git a/src/openrct2/world/Climate.cpp b/src/openrct2/world/Climate.cpp index 858f0e631b..4d8282e664 100644 --- a/src/openrct2/world/Climate.cpp +++ b/src/openrct2/world/Climate.cpp @@ -22,7 +22,7 @@ #include "../audio/audio.h" #include "../audio/AudioMixer.h" #include "../Cheats.h" -#include "../drawing/drawing.h" +#include "../drawing/Drawing.h" #include "../Game.h" #include "../interface/window.h" #include "../localisation/date.h" diff --git a/src/openrct2/world/Climate.h b/src/openrct2/world/Climate.h index 3e1c3b04dc..df113e15c5 100644 --- a/src/openrct2/world/Climate.h +++ b/src/openrct2/world/Climate.h @@ -18,7 +18,7 @@ #include "../common.h" -#include "../drawing/drawing.h" +#include "../drawing/Drawing.h" enum CLIMATE { diff --git a/test/testpaint/TestPaint.hpp b/test/testpaint/TestPaint.hpp index 03c2b7d816..994f1d6ba3 100644 --- a/test/testpaint/TestPaint.hpp +++ b/test/testpaint/TestPaint.hpp @@ -22,7 +22,7 @@ extern "C" { - #include + #include #include #include #include diff --git a/test/testpaint/generate.cpp b/test/testpaint/generate.cpp index c991dbcbfa..6d3b3ebe30 100644 --- a/test/testpaint/generate.cpp +++ b/test/testpaint/generate.cpp @@ -104,7 +104,7 @@ private: { const char * includes[] = { - "../../drawing/drawing.h", + "../../drawing/Drawing.h", "../../paint/supports.h", "../../interface/viewport.h", "../../paint/tile_element/tile_element.h",