[Scummvm-cvs-logs] scummvm master -> 2b8140136836a9620714a25bce597909849fe2a6

eriktorbjorn eriktorbjorn at telia.com
Wed Jun 15 06:10:35 CEST 2016


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
2b81401368 SCUMM HE: Silence GCC "suggest parentheses" warnings


Commit: 2b8140136836a9620714a25bce597909849fe2a6
    https://github.com/scummvm/scummvm/commit/2b8140136836a9620714a25bce597909849fe2a6
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2016-06-15T06:09:48+02:00

Commit Message:
SCUMM HE: Silence GCC "suggest parentheses" warnings

Thanks to sev for confirming that this is the intended expressions.

Changed paths:
    engines/scumm/he/moonbase/distortion.cpp



diff --git a/engines/scumm/he/moonbase/distortion.cpp b/engines/scumm/he/moonbase/distortion.cpp
index 4f09ba5..8465771 100644
--- a/engines/scumm/he/moonbase/distortion.cpp
+++ b/engines/scumm/he/moonbase/distortion.cpp
@@ -91,8 +91,8 @@ static void blitDistortionCore(
 
 		for (int i = cw; --i >= 0;) {
 			uint16 p = READ_LE_UINT16(is);
-			int sx = baseX + dx + (p >> 5) & 0x1f; // G color
-			int sy = baseY + dy + p & 0x1f;        // B color;
+			int sx = baseX + dx + ((p >> 5) & 0x1f); // G color
+			int sy = baseY + dy + (p & 0x1f);        // B color;
 
 			if (transferOp == kReflectionClipped) {
 				if (sx < srcClipRect->left)






More information about the Scummvm-git-logs mailing list