Mercurial > hg > openttd
changeset 17159:9b1a3a21da0a draft
(svn r21897) -Fix (21707): Kenobi visited IsValidConsoleColour shortly
author | rubidium <rubidium@openttd.org> |
---|---|
date | Sun, 23 Jan 2011 00:11:15 +0000 |
parents | 05a943acaeda |
children | 9f97def2f4bb |
files | src/console_gui.cpp src/gfx_type.h |
diffstat | 2 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/console_gui.cpp +++ b/src/console_gui.cpp @@ -509,7 +509,7 @@ /* A text colour from the palette is used; must be the company * colour gradient, so it must be one of those. */ c &= ~TC_IS_PALETTE_COLOUR; - for (uint i = TC_BEGIN; i < TC_END; i++) { + for (uint i = COLOUR_BEGIN; i < COLOUR_END; i++) { if (_colour_gradient[i][4] == c) return true; }
--- a/src/gfx_type.h +++ b/src/gfx_type.h @@ -181,7 +181,8 @@ }; enum Colours { - COLOUR_DARK_BLUE, + COLOUR_BEGIN, + COLOUR_DARK_BLUE = COLOUR_BEGIN, COLOUR_PALE_GREEN, COLOUR_PINK, COLOUR_YELLOW, @@ -200,7 +201,7 @@ COLOUR_END, INVALID_COLOUR = 0xFF, }; -template <> struct EnumPropsT<Colours> : MakeEnumPropsT<Colours, byte, COLOUR_DARK_BLUE, COLOUR_END, INVALID_COLOUR, 4> {}; +template <> struct EnumPropsT<Colours> : MakeEnumPropsT<Colours, byte, COLOUR_BEGIN, COLOUR_END, INVALID_COLOUR, 4> {}; /** Colour of the strings, see _string_colourmap in table/palettes.h or docs/ottd-colourtext-palette.png */ enum TextColour {