From 5f81ba886c0d1341441d68b3346a374c77aac972 Mon Sep 17 00:00:00 2001 From: rubidium Date: Wed, 13 May 2009 17:39:00 +0000 Subject: (svn r16297) -Codechange: silence more ICC warnings --- src/gfx.cpp | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'src/gfx.cpp') diff --git a/src/gfx.cpp b/src/gfx.cpp index 9f762301c..775cd94a5 100644 --- a/src/gfx.cpp +++ b/src/gfx.cpp @@ -1058,18 +1058,26 @@ void DoPaletteAnimations() byte i = (_palette_animation_counter >> 1) & 0x7F; byte v; - (v = 255, i < 0x3f) || - (v = 128, i < 0x4A || i >= 0x75) || - (v = 20); + if (i < 0x3f) { + v = 255; + } else if (i < 0x4A || i >= 0x75) { + v = 128; + } else { + v = 20; + } palette_pos->r = v; palette_pos->g = 0; palette_pos->b = 0; palette_pos++; i ^= 0x40; - (v = 255, i < 0x3f) || - (v = 128, i < 0x4A || i >= 0x75) || - (v = 20); + if (i < 0x3f) { + v = 255; + } else if (i < 0x4A || i >= 0x75) { + v = 128; + } else { + v = 20; + } palette_pos->r = v; palette_pos->g = 0; palette_pos->b = 0; -- cgit v1.2.3-54-g00ecf