mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r21640) -Change/Feature-ish: allow disabling the shading when drawing text

release/1.1
rubidium 2010-12-25 20:02:04 +00:00
parent 1d21903eb4
commit 9b2a54bfbf
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gfx.cpp
View File

@ -286,9 +286,9 @@ static void SetColourRemap(TextColour colour)
/* Black strings have no shading ever; the shading is black, so it /* Black strings have no shading ever; the shading is black, so it
* would be invisible at best, but it actually makes it illegible. */ * 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; 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[1] = raw_colour ? (byte)colour : _string_colourmap[_use_palette][colour];
_string_colourremap[2] = no_shade ? 0 : (_use_palette == PAL_DOS ? 1 : 215); _string_colourremap[2] = no_shade ? 0 : (_use_palette == PAL_DOS ? 1 : 215);

1
src/gfx_type.h
View File

@ -225,6 +225,7 @@ enum TextColour {
TC_INVALID = 0xFF, TC_INVALID = 0xFF,
TC_IS_PALETTE_COLOUR = 0x100, ///< Colour value is already a real palette colour index, not an index of a StringColour. 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) DECLARE_ENUM_AS_BIT_SET(TextColour)