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

Codechange: Add ColourShade enum.

Browse Source
This commit is contained in:
Peter Nelson
2023-12-28 10:02:49 +00:00
committed by Peter Nelson
parent 0463d4c198
commit ae3390fe48
22 changed files with 72 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/palette.cpp
View File

@@ -300,7 +300,7 @@ TextColour GetContrastColour(uint8_t background, uint8_t threshold)
*/
struct ColourGradients
{
using ColourGradient = std::array<byte, 8>;
using ColourGradient = std::array<byte, SHADE_END>;
static inline std::array<ColourGradient, COLOUR_END> gradient{};
};
@@ -311,9 +311,9 @@ struct ColourGradients
* @param shade Shade level from 1 to 7.
* @returns palette index of colour.
*/
byte GetColourGradient(Colours colour, uint8_t shade)
byte GetColourGradient(Colours colour, ColourShade shade)
{
return ColourGradients::gradient[colour % COLOUR_END][shade % 8];
return ColourGradients::gradient[colour % COLOUR_END][shade % SHADE_END];
}
/**
@@ -322,9 +322,9 @@ byte GetColourGradient(Colours colour, uint8_t shade)
* @param shade Shade level from 1 to 7.
* @param palette_index Palette index to set.
*/
void SetColourGradient(Colours colour, uint8_t shade, byte palette_index)
void SetColourGradient(Colours colour, ColourShade shade, byte palette_index)
{
assert(colour < COLOUR_END);
assert(shade < 8);
ColourGradients::gradient[colour % COLOUR_END][shade % 8] = palette_index;
assert(shade < SHADE_END);
ColourGradients::gradient[colour % COLOUR_END][shade % SHADE_END] = palette_index;
}