summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2011-01-03 12:04:53 +0000
committerrubidium <rubidium@openttd.org>2011-01-03 12:04:53 +0000
commit37b9c311184c21dda3da165c18933b707d2a227b (patch)
treea484321be95407af5b029484a757eea8bb191f5a /src
parentb25cf57542dbf294a9de3f7a9910e1e08e6ed7a4 (diff)
downloadopenttd-37b9c311184c21dda3da165c18933b707d2a227b.tar.xz
(svn r21702) -Fix: make sure the colour argument of echoc is properly validated to be a text colour
Diffstat (limited to 'src')
-rw-r--r--src/console_cmds.cpp2
-rw-r--r--src/gfx_type.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/console_cmds.cpp b/src/console_cmds.cpp
index 85c3a6d98..4012c1c8a 100644
--- a/src/console_cmds.cpp
+++ b/src/console_cmds.cpp
@@ -958,7 +958,7 @@ DEF_CONSOLE_CMD(ConEchoC)
}
if (argc < 3) return false;
- IConsolePrint((TextColour)atoi(argv[1]), argv[2]);
+ IConsolePrint((TextColour)Clamp(atoi(argv[1]), TC_BEGIN, TC_END - 1), argv[2]);
return true;
}
diff --git a/src/gfx_type.h b/src/gfx_type.h
index e99e3414d..79b30fb2b 100644
--- a/src/gfx_type.h
+++ b/src/gfx_type.h
@@ -204,6 +204,7 @@ template <> struct EnumPropsT<Colours> : MakeEnumPropsT<Colours, byte, COLOUR_DA
/** Colour of the strings, see _string_colourmap in table/palettes.h or docs/ottd-colourtext-palette.png */
enum TextColour {
+ TC_BEGIN = 0x00,
TC_FROMSTRING = 0x00,
TC_BLUE = 0x00,
TC_SILVER = 0x01,
@@ -222,6 +223,7 @@ enum TextColour {
TC_GREY = 0x0E,
TC_DARK_BLUE = 0x0F,
TC_BLACK = 0x10,
+ TC_END,
TC_INVALID = 0xFF,
TC_IS_PALETTE_COLOUR = 0x100, ///< Colour value is already a real palette colour index, not an index of a StringColour.