[Scummvm-cvs-logs] CVS: scummvm/scumm akos.cpp,1.255,1.256
kirben
kirben at users.sourceforge.net
Sat Feb 4 23:56:01 CET 2006
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31266/scumm
Modified Files:
akos.cpp
Log Message:
Revert back to original shadow detection.
Index: akos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/akos.cpp,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -d -r1.255 -r1.256
--- akos.cpp 5 Feb 2006 06:32:15 -0000 1.255
+++ akos.cpp 5 Feb 2006 07:55:13 -0000 1.256
@@ -366,9 +366,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;
@@ -467,10 +464,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;
@@ -490,9 +488,6 @@
} else {
decflag = (a->_heCondMask & cond) ? 1 : 0;
}
-
- if (_vm->_heversion >= 90 && (shadowMask & 0x8000) && xmap)
- _shadow_mode = 3;
}
}
@@ -501,6 +496,10 @@
if (decflag == 0)
continue;
+ if (_vm->_heversion >= 90) {
+ _shadow_mode = ((shadowMask & 0x8000) && xmap) ? 3 : 0;
+ }
+
switch (codec) {
case 1:
result |= codec1(xmoveCur, ymoveCur);
More information about the Scummvm-git-logs
mailing list