summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2010-12-26 06:52:38 +0000
committerrubidium <rubidium@openttd.org>2010-12-26 06:52:38 +0000
commit8a278f771163b11074d23a573840af7b945abb8c (patch)
tree996eec78bca0d1ac3ebb467b65c062bb4fd0c9eb
parent9b2a54bfbf418952941a4b4e62a21c1f96281129 (diff)
downloadopenttd-8a278f771163b11074d23a573840af7b945abb8c.tar.xz
(svn r21641) -Fix (r21639): ofcourse MSVC wants to have something to warn about
-rw-r--r--src/gfx.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gfx.cpp b/src/gfx.cpp
index 61df67745..410ea6686 100644
--- a/src/gfx.cpp
+++ b/src/gfx.cpp
@@ -286,8 +286,8 @@ static void SetColourRemap(TextColour colour)
/* 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_NO_SHADE || colour == TC_BLACK;
- bool raw_colour = colour & TC_IS_PALETTE_COLOUR;
+ bool no_shade = (colour & TC_NO_SHADE) != 0 || colour == TC_BLACK;
+ bool raw_colour = (colour & TC_IS_PALETTE_COLOUR) != 0;
colour &= ~(TC_NO_SHADE | TC_IS_PALETTE_COLOUR);
_string_colourremap[1] = raw_colour ? (byte)colour : _string_colourmap[_use_palette][colour];