changeset 16906:59bd46ae292e draft

(svn r21641) -Fix (r21639): ofcourse MSVC wants to have something to warn about
author rubidium <rubidium@openttd.org>
date Sun, 26 Dec 2010 06:52:38 +0000
parents 32504a1a6474
children e2be394e4714
files src/gfx.cpp
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/gfx.cpp
+++ b/src/gfx.cpp
@@ -286,8 +286,8 @@
 
 	/* 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];