From f3834ef2d608383b089c761a24ab05858cb13dce Mon Sep 17 00:00:00 2001 From: Aaron van Geffen Date: Tue, 9 Jul 2024 14:51:11 +0200 Subject: [PATCH] Move colour_t definition to Colour.h --- src/openrct2/common.h | 2 -- src/openrct2/interface/Colour.h | 1 + src/openrct2/paint/tile_element/Paint.Surface.h | 2 +- src/openrct2/ride/RideColour.h | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/openrct2/common.h b/src/openrct2/common.h index 67b4d2d0ff..147254667e 100644 --- a/src/openrct2/common.h +++ b/src/openrct2/common.h @@ -25,8 +25,6 @@ #include #include -using colour_t = uint8_t; - // Gets the name of a symbol as a C string #define nameof(symbol) #symbol diff --git a/src/openrct2/interface/Colour.h b/src/openrct2/interface/Colour.h index 36eae268ed..7c1bd123d4 100644 --- a/src/openrct2/interface/Colour.h +++ b/src/openrct2/interface/Colour.h @@ -14,6 +14,7 @@ #include +using colour_t = uint8_t; using PaletteIndex = uint8_t; /** diff --git a/src/openrct2/paint/tile_element/Paint.Surface.h b/src/openrct2/paint/tile_element/Paint.Surface.h index d174132e9a..06eae8f303 100644 --- a/src/openrct2/paint/tile_element/Paint.Surface.h +++ b/src/openrct2/paint/tile_element/Paint.Surface.h @@ -9,7 +9,7 @@ #pragma once -#include "../../common.h" +#include "../../interface/Colour.h" #include "../../sprites.h" #include "../../world/Location.hpp" diff --git a/src/openrct2/ride/RideColour.h b/src/openrct2/ride/RideColour.h index 4dc6836b39..9fe0d61d25 100644 --- a/src/openrct2/ride/RideColour.h +++ b/src/openrct2/ride/RideColour.h @@ -9,7 +9,7 @@ #pragma once -#include "../common.h" +#include "../interface/Colour.h" #include