changeset 16905:32504a1a6474 draft

(svn r21640) -Change/Feature-ish: allow disabling the shading when drawing text
author rubidium <rubidium@openttd.org>
date Sat, 25 Dec 2010 20:02:04 +0000
parents 3b7988f1cf24
children 59bd46ae292e
files src/gfx.cpp src/gfx_type.h
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/gfx.cpp
+++ b/src/gfx.cpp
@@ -286,9 +286,9 @@
 
 	/* Black strings have no shading ever; the shading is black, so it
 	 * would be invisible at best, but it actually makes it illegible. */
-	bool no_shade   = colour == TC_BLACK;
+	bool no_shade   = colour & TC_NO_SHADE || colour == TC_BLACK;
 	bool raw_colour = colour & TC_IS_PALETTE_COLOUR;
-	colour &= ~TC_IS_PALETTE_COLOUR;
+	colour &= ~(TC_NO_SHADE | TC_IS_PALETTE_COLOUR);
 
 	_string_colourremap[1] = raw_colour ? (byte)colour : _string_colourmap[_use_palette][colour];
 	_string_colourremap[2] = no_shade ? 0 : (_use_palette == PAL_DOS ? 1 : 215);
--- a/src/gfx_type.h
+++ b/src/gfx_type.h
@@ -225,6 +225,7 @@
 	TC_INVALID     = 0xFF,
 
 	TC_IS_PALETTE_COLOUR = 0x100, ///< Colour value is already a real palette colour index, not an index of a StringColour.
+	TC_NO_SHADE          = 0x200, ///< Do not add shading to this text colour.
 };
 DECLARE_ENUM_AS_BIT_SET(TextColour)