[Scummvm-cvs-logs] SF.net SVN: scummvm:[50953] scummvm/trunk/engines/m4/mads_player.cpp

[lordhoto at users.sourceforge.net]

Revision: 50953
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50953&view=rev
Author:   lordhoto
Date:     2010-07-16 23:30:50 +0000 (Fri, 16 Jul 2010)

Log Message:
-----------
Fix use of "&&" instead of "&" for bit masking. (This looks much more sensible at least!)

Modified Paths:
--------------
    scummvm/trunk/engines/m4/mads_player.cpp

Modified: scummvm/trunk/engines/m4/mads_player.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_player.cpp	2010-07-16 23:30:29 UTC (rev 50952)
+++ scummvm/trunk/engines/m4/mads_player.cpp	2010-07-16 23:30:50 UTC (rev 50953)
@@ -634,7 +634,7 @@
 	// Outer horizontal movement loop
 	for (int yIndex = 0; yIndex < yDiff; ++yIndex) {
 		index += yDiff;
-		int v = (*srcP && 0x7F) >> 4;
+		int v = (*srcP & 0x7F) >> 4;
 		if (v)
 			return v;
 
@@ -642,7 +642,7 @@
 		while (index >= xDiff) {
 			index -= xDiff;
 
-			v = (*srcP && 0x7F) >> 4;
+			v = (*srcP & 0x7F) >> 4;
 			if (v)
 				return v;
 


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