From 0ea7589e2ca4fce7dd07e9e757b8527652e2ac58 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Mon, 30 Mar 2009 12:08:12 +0000
Subject: TINSEL: Commit of parentheses patch from salty-horse. (from -devel
 "Enabling -Wparentheses in the Makefile").

svn-id: r39759
---
 engines/tinsel/bmv.cpp     | 2 +-
 engines/tinsel/move.cpp    | 4 ++--
 engines/tinsel/palette.cpp | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'engines')

diff --git a/engines/tinsel/bmv.cpp b/engines/tinsel/bmv.cpp
index 208184035b..edfc8c1243 100644
--- a/engines/tinsel/bmv.cpp
+++ b/engines/tinsel/bmv.cpp
@@ -260,7 +260,7 @@ static void PrepBMV(const byte *sourceData, int length, short deltaFetchDisp) {
 			firstLoop = true;
 		} else {
 			// Get the high nibble
-			eax = eax & 0xffffff00 | (NibbleHi >> 4);
+			eax = (eax & 0xffffff00) | (NibbleHi >> 4);
 			firstLoop = false;
 		}
 
diff --git a/engines/tinsel/move.cpp b/engines/tinsel/move.cpp
index 621d069aa5..25aeec67ba 100644
--- a/engines/tinsel/move.cpp
+++ b/engines/tinsel/move.cpp
@@ -1024,8 +1024,8 @@ static void NewCoOrdinates(int fromx, int fromy, int *targetX, int *targetY,
 	/*------------------------------------------------
 	 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;
 
 	/*----------------------------------------------------
diff --git a/engines/tinsel/palette.cpp b/engines/tinsel/palette.cpp
index 91f3f46a24..e3b2bd4f88 100644
--- a/engines/tinsel/palette.cpp
+++ b/engines/tinsel/palette.cpp
@@ -280,8 +280,8 @@ PALQ *AllocPalette(SCNHANDLE hNewPal) {
 						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 @@ void SwapPalette(PALQ *pPalQ, SCNHANDLE hNewPal) {
 				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,
-- 
cgit v1.2.3