[Scummvm-cvs-logs] CVS: scummvm/scumm akos.cpp,1.236.2.13,1.236.2.14

[kirben]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29212/scumm

Modified Files:
      Tag: branch-0-8-0
	akos.cpp 
Log Message:

Ooops, commited too much.


Index: akos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/akos.cpp,v
retrieving revision 1.236.2.13
retrieving revision 1.236.2.14
diff -u -d -r1.236.2.13 -r1.236.2.14
--- akos.cpp	5 Feb 2006 06:32:25 -0000	1.236.2.13
+++ akos.cpp	5 Feb 2006 07:45:47 -0000	1.236.2.14
@@ -365,9 +365,6 @@
 	bool useCondMask;
 	int lastDx, lastDy;
 
-	if (_vm->_heversion >= 90)
-		_shadow_mode = 0;
-
 	lastDx = lastDy = 0;
 	for (i = 0; i < 32; ++i) {
 		heCondMaskIndex[i] = i;
@@ -469,10 +466,11 @@
 				_ymove -= lastDy;
 			}
 
+			uint16 shadowMask = 0;
+
 			if (!useCondMask || !akct) {
 				decflag = 1;
 			} else {
-				uint16 shadowMask = 0;
 				uint32 cond = READ_LE_UINT32(akct + cost.heCondMaskTable[limb] + heCondMaskIndex[i] * 4);
 				if (cond == 0) {
 					decflag = 1;
@@ -493,8 +491,9 @@
 						decflag = (a->_heCondMask & cond) ? 1 : 0;
 					}
 
-					if (_vm->_heversion >= 90 && (shadowMask & 0x8000) && xmap)
-						_shadow_mode = 3;
+					if (_vm->_heversion >= 90) {
+						_shadow_mode = ((shadowMask & 0x8000) && xmap) ? 3 : 0;
+					}
 				}
 			}