dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change Colour constructors to be constexpr

Browse Source
This commit is contained in:
Jonathan G Rennison
2023-08-14 17:07:42 +01:00
parent 95f3cf2a8e
commit 2b8171093a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blitter/common.hpp
View File

@@ -21,7 +21,7 @@
#endif #endif
/** Cached black value. */ /** Cached black value. */
static const Colour _black_colour(0, 0, 0); static const constexpr Colour _black_colour(0, 0, 0);
template <typename SetPixelT> template <typename SetPixelT>
void Blitter::DrawLineGeneric(int x1, int y1, int x2, int y2, int screen_width, int screen_height, int width, int dash, SetPixelT set_pixel) void Blitter::DrawLineGeneric(int x1, int y1, int x2, int y2, int screen_width, int screen_height, int width, int dash, SetPixelT set_pixel)

4
src/gfx_type.h
View File

@@ -180,7 +180,7 @@ union Colour {
* @param b The channel for the blue colour. * @param b The channel for the blue colour.
* @param a The channel for the alpha/transparency. * @param a The channel for the alpha/transparency.
*/ */
Colour(uint8 r, uint8 g, uint8 b, uint8 a = 0xFF) : constexpr Colour(uint8 r, uint8 g, uint8 b, uint8 a = 0xFF) :
#if defined(__EMSCRIPTEN__) #if defined(__EMSCRIPTEN__)
r(r), g(g), b(b), a(a) r(r), g(g), b(b), a(a)
#elif TTD_ENDIAN == TTD_BIG_ENDIAN #elif TTD_ENDIAN == TTD_BIG_ENDIAN
@@ -195,7 +195,7 @@ union Colour {
* Create a new colour. * Create a new colour.
* @param data The colour in the correct packed format. * @param data The colour in the correct packed format.
*/ */
Colour(uint data = 0) : data(data) constexpr Colour(uint data = 0) : data(data)
{ {
} }
}; };