[Scummvm-cvs-logs] SF.net SVN: scummvm:[40893] scummvm/trunk/engines/sci/gfx/operations.cpp

[wjpalenstijn at users.sourceforge.net]

Revision: 40893
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40893&view=rev
Author:   wjpalenstijn
Date:     2009-05-25 19:48:52 +0000 (Mon, 25 May 2009)

Log Message:
-----------
SCI: Only let gfxop_set_color use priority/control if mask has their bits set.
This fixes a regression from r39089 where text in the KQ5(floppy) intro
was displayed behind trees.

Modified Paths:
--------------
    scummvm/trunk/engines/sci/gfx/operations.cpp

Modified: scummvm/trunk/engines/sci/gfx/operations.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/operations.cpp	2009-05-25 17:51:11 UTC (rev 40892)
+++ scummvm/trunk/engines/sci/gfx/operations.cpp	2009-05-25 19:48:52 UTC (rev 40893)
@@ -596,12 +596,13 @@
 
 // Wrapper for gfxop_set_color
 int gfxop_set_color(GfxState *state, gfx_color_t *colorOut, gfx_color_t &colorIn) {
-	if (colorIn.mask & GFX_MASK_VISUAL)
-		return gfxop_set_color(state, colorOut, colorIn.visual.r, colorIn.visual.g, colorIn.visual.b,
-			colorIn.alpha, colorIn.priority, colorIn.control);
-	else
-		return gfxop_set_color(state, colorOut, -1, -1, -1, colorIn.alpha,
-			colorIn.priority, colorIn.control);
+	return gfxop_set_color(state, colorOut,
+	              (colorIn.mask & GFX_MASK_VISUAL) ? colorIn.visual.r : -1,
+	              (colorIn.mask & GFX_MASK_VISUAL) ? colorIn.visual.g : -1,
+	              (colorIn.mask & GFX_MASK_VISUAL) ? colorIn.visual.b : -1,
+	              (colorIn.mask & GFX_MASK_VISUAL) ? colorIn.alpha : -1,
+	              (colorIn.mask & GFX_MASK_PRIORITY) ? colorIn.priority : -1,
+	              (colorIn.mask & GFX_MASK_CONTROL) ? colorIn.control : -1);
 }
 
 int gfxop_set_system_color(GfxState *state, unsigned int index, gfx_color_t *color) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.