dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r21639) -Codechange: simplify setting the colour remap

Browse Source
This commit is contained in:
rubidium
2010-12-25 19:59:56 +00:00
parent d2564a3e56
commit 1d21903eb4
2 changed files with 44 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/gfx.cpp
View File

@@ -284,13 +284,14 @@ static void SetColourRemap(TextColour colour)
{
if (colour == TC_INVALID) return;
if (colour & TC_IS_PALETTE_COLOUR) {
_string_colourremap[1] = colour & ~TC_IS_PALETTE_COLOUR;
_string_colourremap[2] = (_use_palette == PAL_DOS) ? 1 : 215;
} else {
_string_colourremap[1] = _string_colourmap[_use_palette][colour].text;
_string_colourremap[2] = _string_colourmap[_use_palette][colour].shadow;
}
/* 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 raw_colour = colour & TC_IS_PALETTE_COLOUR;
colour &= ~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);
_colour_remap_ptr = _string_colourremap;
}