[Scummvm-cvs-logs] SF.net SVN: scummvm:[39759] scummvm/trunk/engines/tinsel

[lordhoto at users.sourceforge.net]

Revision: 39759
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39759&view=rev
Author:   lordhoto
Date:     2009-03-30 12:08:12 +0000 (Mon, 30 Mar 2009)

Log Message:
-----------
TINSEL: Commit of parentheses patch from salty-horse. (from -devel "Enabling -Wparentheses in the Makefile").

Modified Paths:
--------------
    scummvm/trunk/engines/tinsel/bmv.cpp
    scummvm/trunk/engines/tinsel/move.cpp
    scummvm/trunk/engines/tinsel/palette.cpp

Modified: scummvm/trunk/engines/tinsel/bmv.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/bmv.cpp	2009-03-30 11:35:12 UTC (rev 39758)
+++ scummvm/trunk/engines/tinsel/bmv.cpp	2009-03-30 12:08:12 UTC (rev 39759)
@@ -260,7 +260,7 @@
 			firstLoop = true;
 		} else {
 			// Get the high nibble
-			eax = eax & 0xffffff00 | (NibbleHi >> 4);
+			eax = (eax & 0xffffff00) | (NibbleHi >> 4);
 			firstLoop = false;
 		}
 

Modified: scummvm/trunk/engines/tinsel/move.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/move.cpp	2009-03-30 11:35:12 UTC (rev 39758)
+++ scummvm/trunk/engines/tinsel/move.cpp	2009-03-30 12:08:12 UTC (rev 39759)
@@ -1024,8 +1024,8 @@
 	/*------------------------------------------------
 	 Don't overrun if this is the final destination. |
 	 ------------------------------------------------*/
-	if (*targetX == pMover->UtargetX && (*targetY == -1 || *targetY == pMover->UtargetY) ||
-			*targetY == pMover->UtargetY && (*targetX == -1 || *targetX == pMover->UtargetX))
+	if ((*targetX == pMover->UtargetX && (*targetY == -1 || *targetY == pMover->UtargetY)) ||
+		(*targetY == pMover->UtargetY && (*targetX == -1 || *targetX == pMover->UtargetX)))
 		bOver = false;
 
 	/*----------------------------------------------------

Modified: scummvm/trunk/engines/tinsel/palette.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/palette.cpp	2009-03-30 11:35:12 UTC (rev 39758)
+++ scummvm/trunk/engines/tinsel/palette.cpp	2009-03-30 12:08:12 UTC (rev 39759)
@@ -280,8 +280,8 @@
 						break;
 
 					// move palette down - indicate change
-					pNxtPal->posInDAC = pPrev->posInDAC
-						+ pPrev->numColours | PALETTE_MOVED;
+					pNxtPal->posInDAC = (pPrev->posInDAC
+						+ pPrev->numColours) | PALETTE_MOVED;
 
 					// Q the palette change in position to the video DAC
 					if (!TinselV2)
@@ -396,8 +396,8 @@
 				break;
 
 			// move palette down
-			pNxtPalQ->posInDAC = pPalQ->posInDAC
-				+ pPalQ->numColours | PALETTE_MOVED;
+			pNxtPalQ->posInDAC = (pPalQ->posInDAC
+				+ pPalQ->numColours) | PALETTE_MOVED;
 
 			// Q the palette change in position to the video DAC
 			UpdateDACqueueHandle(pNxtPalQ->posInDAC,


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