cpp/openttd-patchpack/source Changeset - r16956:cd603c817b60

Changeset - r16956:cd603c817b60

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

rubidium - 13 years ago 2011-01-03 12:04:53
rubidium@openttd.org

(svn r21702) -Fix: make sure the colour argument of echoc is properly validated to be a text colour

2 files changed with 3 insertions and 1 deletions:

src/console_cmds.cpp

src/gfx_type.h

0 comments (0 inline, 0 general)

src/console_cmds.cpp

➞

Show inline comments

@@ @@ -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;
+}

src/gfx_type.h

➞

Show inline comments

@@ @@ -204,6 +204,7 @@ template <> struct EnumPropsT<Colours> : @@
 /** 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.

0 comments (0 inline, 0 general)