From 8a278f771163b11074d23a573840af7b945abb8c Mon Sep 17 00:00:00 2001 From: rubidium Date: Sun, 26 Dec 2010 06:52:38 +0000 Subject: (svn r21641) -Fix (r21639): ofcourse MSVC wants to have something to warn about --- src/gfx.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/gfx.cpp') 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]; -- cgit v1.2.3-54-g00ecf