Refactor drawing.c to C++

2018-01-05 21:17:33 +00:00 · 2018-01-05 21:17:33 +00:00 · 3dcbebcf68
parent 144dbf431c
commit 3dcbebcf68
96 changed files with 100 additions and 95 deletions
--- a/src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp
+++ b/src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp
@ -32,7 +32,7 @@

 #include <openrct2/interface/window.h>
 #include <openrct2/Intro.h>
-#include <openrct2/drawing/drawing.h>
+#include <openrct2/drawing/Drawing.h>
 #include <openrct2/drawing/LightFX.h>

 #include "../DrawingEngines.h"
--- 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 <openrct2/common.h>
-#include <openrct2/drawing/drawing.h>
+#include <openrct2/drawing/Drawing.h>
 #include "OpenGLAPI.h"

 #include <vector>
--- a/src/openrct2-ui/drawing/engines/opengl/TextureCache.cpp
+++ b/src/openrct2-ui/drawing/engines/opengl/TextureCache.cpp
@ -21,7 +21,7 @@
 #include <openrct2/core/Memory.hpp>
 #include "TextureCache.h"

-#include <openrct2/drawing/drawing.h>
+#include <openrct2/drawing/Drawing.h>

 TextureCache::~TextureCache()
 {
--- a/src/openrct2-ui/interface/Graph.h
+++ b/src/openrct2-ui/interface/Graph.h
@ -18,7 +18,7 @@
 #define _GRAPH_H_

 #include <openrct2/common.h>
-#include <openrct2/drawing/drawing.h>
+#include <openrct2/drawing/Drawing.h>

 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);
--- a/src/openrct2-ui/windows/MazeConstruction.cpp
+++ b/src/openrct2-ui/windows/MazeConstruction.cpp
@ -18,7 +18,7 @@

 #include <openrct2/audio/audio.h>
 #include <openrct2/Context.h>
-#include <openrct2/drawing/drawing.h>
+#include <openrct2/drawing/Drawing.h>
 #include <openrct2/Game.h>
 #include <openrct2/Input.h>
 #include <openrct2/interface/viewport.h>
--- a/src/openrct2-ui/windows/StaffList.cpp
+++ b/src/openrct2-ui/windows/StaffList.cpp
@ -20,7 +20,7 @@
 #include <openrct2-ui/windows/Window.h>
 #include <openrct2/Context.h>

-#include <openrct2/drawing/drawing.h>
+#include <openrct2/drawing/Drawing.h>
 #include <openrct2/Game.h>
 #include <openrct2/Input.h>
 #include <openrct2/interface/viewport.h>
--- a/src/openrct2/CmdlineSprite.cpp
+++ b/src/openrct2/CmdlineSprite.cpp
@ -18,7 +18,7 @@

 #include <jansson.h>
 #include "CmdlineSprite.h"
-#include "drawing/drawing.h"
+#include "drawing/Drawing.h"
 #include "Imaging.h"
 #include "localisation/localisation.h"
 #include "OpenRCT2.h"
--- 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

--- 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"

--- 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,
--- a/src/openrct2/drawing/Drawing.cpp
+++ 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);
    }
 }
+
+}
--- a/src/openrct2/drawing/Drawing.h
+++ b/src/openrct2/drawing/Drawing.h
--- 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<sint32 image_type, sint32 zoom_level>
 static void FASTCALL DrawRLESprite2(const uint8* RESTRICT source_bits_pointer,
--- 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"

--- 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
 {
--- 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;
--- 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"
--- 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,
--- 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"
 {
--- 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"

--- 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"
--- 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"
 {
--- 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__

--- 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)
--- 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;
--- 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
 {
--- 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;
--- 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"

--- 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"
--- 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
--- 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"

--- 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"
--- 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
 {
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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)
--- 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"
--- 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"

--- a/src/openrct2/object/ImageTable.h
+++ b/src/openrct2/object/ImageTable.h
@ -21,7 +21,7 @@
 #include <vector>
 #include "../common.h"

-#include "../drawing/drawing.h"
+#include "../drawing/Drawing.h"

 interface IReadObjectContext;
 interface IStream;
--- 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()
--- 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"
--- 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()
--- 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"
--- 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)
--- 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"
--- 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;
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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;
--- 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"
--- 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
 {
--- a/test/testpaint/TestPaint.hpp
+++ b/test/testpaint/TestPaint.hpp
@ -22,7 +22,7 @@

 extern "C"
 {
-    #include <openrct2/drawing/drawing.h>
+    #include <openrct2/drawing/Drawing.h>
    #include <openrct2/interface/colour.h>
    #include <openrct2/paint/Paint.h>
    #include <openrct2/paint/tile_element/TileElement.h>
--- 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",