From 630a5065db003bfec2a4582dc6db01f946b44613 Mon Sep 17 00:00:00 2001 From: Ted John Date: Fri, 5 Jan 2018 23:08:58 +0000 Subject: [PATCH] Refactor colour.c to C++ --- src/openrct2/drawing/Drawing.h | 2 +- src/openrct2/drawing/Rect.cpp | 2 +- src/openrct2/drawing/ScrollingText.cpp | 2 +- src/openrct2/drawing/String.cpp | 2 +- src/openrct2/interface/{colour.c => Colour.cpp} | 12 +++++++++--- src/openrct2/interface/{colour.h => Colour.h} | 0 src/openrct2/interface/viewport.c | 2 +- src/openrct2/interface/window.h | 2 +- src/openrct2/paint/Paint.h | 2 +- src/openrct2/paint/tile_element/Fence.cpp | 2 +- src/openrct2/rct1/Tables.cpp | 2 +- src/openrct2/ride/ride_data.c | 2 +- src/openrct2/world/Park.cpp | 2 +- test/testpaint/TestPaint.hpp | 2 +- test/testpaint/compat.c | 2 +- 15 files changed, 22 insertions(+), 16 deletions(-) rename src/openrct2/interface/{colour.c => Colour.cpp} (94%) rename src/openrct2/interface/{colour.h => Colour.h} (100%) diff --git a/src/openrct2/drawing/Drawing.h b/src/openrct2/drawing/Drawing.h index 8f9a60bbeb..134cbb6f89 100644 --- a/src/openrct2/drawing/Drawing.h +++ b/src/openrct2/drawing/Drawing.h @@ -18,7 +18,7 @@ #define _DRAWING_H_ #include "../common.h" -#include "../interface/colour.h" +#include "../interface/Colour.h" #include "Font.h" typedef struct rct_g1_element { diff --git a/src/openrct2/drawing/Rect.cpp b/src/openrct2/drawing/Rect.cpp index dd723de7d5..c94c90e513 100644 --- a/src/openrct2/drawing/Rect.cpp +++ b/src/openrct2/drawing/Rect.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "../common.h" -#include "../interface/colour.h" +#include "../interface/Colour.h" #include "../platform/platform.h" #include "Drawing.h" diff --git a/src/openrct2/drawing/ScrollingText.cpp b/src/openrct2/drawing/ScrollingText.cpp index 4f2c11d055..4a4201d3c2 100644 --- a/src/openrct2/drawing/ScrollingText.cpp +++ b/src/openrct2/drawing/ScrollingText.cpp @@ -16,7 +16,7 @@ #include #include "../config/Config.h" -#include "../interface/colour.h" +#include "../interface/Colour.h" #include "../localisation/Localisation.h" #include "../paint/Paint.h" #include "../sprites.h" diff --git a/src/openrct2/drawing/String.cpp b/src/openrct2/drawing/String.cpp index 1d0a50e68e..9e80f2de0d 100644 --- a/src/openrct2/drawing/String.cpp +++ b/src/openrct2/drawing/String.cpp @@ -16,7 +16,7 @@ #include #include "../config/Config.h" -#include "../interface/colour.h" +#include "../interface/Colour.h" #include "../interface/viewport.h" #include "../localisation/Localisation.h" #include "../platform/platform.h" diff --git a/src/openrct2/interface/colour.c b/src/openrct2/interface/Colour.cpp similarity index 94% rename from src/openrct2/interface/colour.c rename to src/openrct2/interface/Colour.cpp index bc36d6d7b1..e573567376 100644 --- a/src/openrct2/interface/colour.c +++ b/src/openrct2/interface/Colour.cpp @@ -14,9 +14,13 @@ *****************************************************************************/ #pragma endregion +#include #include "../drawing/Drawing.h" -#include "colour.h" #include "../sprites.h" +#include "Colour.h" + +extern "C" +{ rct_colour_map ColourMapA[COLOUR_COUNT] = { 0 }; @@ -85,8 +89,8 @@ static uint8 findClosestPaletteIndex(uint8 red, uint8 green, uint8 blue) uint8 blendColours(const uint8 paletteIndex1, const uint8 paletteIndex2) { - const uint8 cMin = min(paletteIndex1, paletteIndex2); - const uint8 cMax = max(paletteIndex1, paletteIndex2); + const uint8 cMin = std::min(paletteIndex1, paletteIndex2); + const uint8 cMax = std::max(paletteIndex1, paletteIndex2); if (BlendColourMap[cMin][cMax] != 0) { @@ -101,3 +105,5 @@ uint8 blendColours(const uint8 paletteIndex1, const uint8 paletteIndex2) return BlendColourMap[cMin][cMax]; } #endif + +} diff --git a/src/openrct2/interface/colour.h b/src/openrct2/interface/Colour.h similarity index 100% rename from src/openrct2/interface/colour.h rename to src/openrct2/interface/Colour.h diff --git a/src/openrct2/interface/viewport.c b/src/openrct2/interface/viewport.c index 4b71580420..949bc79215 100644 --- a/src/openrct2/interface/viewport.c +++ b/src/openrct2/interface/viewport.c @@ -33,7 +33,7 @@ #include "../world/Map.h" #include "../world/scenery.h" #include "../world/sprite.h" -#include "colour.h" +#include "Colour.h" #include "viewport.h" #include "window.h" diff --git a/src/openrct2/interface/window.h b/src/openrct2/interface/window.h index 159a99a55f..da3a6cb303 100644 --- a/src/openrct2/interface/window.h +++ b/src/openrct2/interface/window.h @@ -26,7 +26,7 @@ #include "../ride/Vehicle.h" #include "../scenario/Scenario.h" #include "../world/Park.h" -#include "colour.h" +#include "Colour.h" struct rct_window; union rct_window_event; diff --git a/src/openrct2/paint/Paint.h b/src/openrct2/paint/Paint.h index 528e282be5..dbb3898dbd 100644 --- a/src/openrct2/paint/Paint.h +++ b/src/openrct2/paint/Paint.h @@ -18,7 +18,7 @@ #include "../common.h" #include "../world/Map.h" -#include "../interface/colour.h" +#include "../interface/Colour.h" #include "../drawing/Drawing.h" typedef struct attached_paint_struct attached_paint_struct; diff --git a/src/openrct2/paint/tile_element/Fence.cpp b/src/openrct2/paint/tile_element/Fence.cpp index 2e7be17a95..c649aaa69b 100644 --- a/src/openrct2/paint/tile_element/Fence.cpp +++ b/src/openrct2/paint/tile_element/Fence.cpp @@ -19,7 +19,7 @@ #include "../../drawing/Drawing.h" #include "../../Game.h" #include "../../localisation/Localisation.h" -#include "../../interface/colour.h" +#include "../../interface/Colour.h" #include "../../interface/viewport.h" #include "../../ride/Track.h" #include "../../world/Map.h" diff --git a/src/openrct2/rct1/Tables.cpp b/src/openrct2/rct1/Tables.cpp index 17d3f870c7..3b62608fa6 100644 --- a/src/openrct2/rct1/Tables.cpp +++ b/src/openrct2/rct1/Tables.cpp @@ -19,7 +19,7 @@ #include "../core/Util.hpp" #include "Tables.h" -#include "../interface/colour.h" +#include "../interface/Colour.h" #include "../rct1.h" #include "../ride/Ride.h" diff --git a/src/openrct2/ride/ride_data.c b/src/openrct2/ride/ride_data.c index c5915a416e..97d21393bf 100644 --- a/src/openrct2/ride/ride_data.c +++ b/src/openrct2/ride/ride_data.c @@ -30,7 +30,7 @@ #include "Track.h" #include "../audio/audio.h" #include "../sprites.h" -#include "../interface/colour.h" +#include "../interface/Colour.h" const bool hasRunningTrack[RIDE_TYPE_COUNT] = { true, // 0 Spiral Roller coaster diff --git a/src/openrct2/world/Park.cpp b/src/openrct2/world/Park.cpp index 93fd394954..971702fdcb 100644 --- a/src/openrct2/world/Park.cpp +++ b/src/openrct2/world/Park.cpp @@ -20,7 +20,7 @@ #include "../core/Memory.hpp" #include "../core/Util.hpp" #include "../Game.h" -#include "../interface/colour.h" +#include "../interface/Colour.h" #include "../interface/window.h" #include "../localisation/Localisation.h" #include "../management/Award.h" diff --git a/test/testpaint/TestPaint.hpp b/test/testpaint/TestPaint.hpp index 994f1d6ba3..91e228d188 100644 --- a/test/testpaint/TestPaint.hpp +++ b/test/testpaint/TestPaint.hpp @@ -23,7 +23,7 @@ extern "C" { #include - #include + #include #include #include } diff --git a/test/testpaint/compat.c b/test/testpaint/compat.c index 2e8f5c2704..db020e77d3 100644 --- a/test/testpaint/compat.c +++ b/test/testpaint/compat.c @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include #include