# HG changeset patch # User rubidium # Date 2010-12-25 20:02:04 # Node ID a79cc0d003c2af0829fd7e5587285466f98c5f4b # Parent 4e74032de978dafe68659e6a077f215a50b86f6b (svn r21640) -Change/Feature-ish: allow disabling the shading when drawing text diff --git a/src/gfx.cpp b/src/gfx.cpp --- a/src/gfx.cpp +++ b/src/gfx.cpp @@ -286,9 +286,9 @@ static void SetColourRemap(TextColour co /* 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); diff --git a/src/gfx_type.h b/src/gfx_type.h --- a/src/gfx_type.h +++ b/src/gfx_type.h @@ -225,6 +225,7 @@ enum TextColour { 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)