[Scummvm-cvs-logs] CVS: scummvm/scumm akos.cpp,1.254,1.255 room.cpp,1.28,1.29
kirben
kirben at users.sourceforge.net
Sat Feb 4 22:33:08 CET 2006
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10232/scumm
Modified Files:
akos.cpp room.cpp
Log Message:
Another regression, palette cycling is used by HE61 too.
Index: akos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/akos.cpp,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -d -r1.254 -r1.255
--- akos.cpp 4 Feb 2006 12:44:31 -0000 1.254
+++ akos.cpp 5 Feb 2006 06:32:15 -0000 1.255
@@ -366,6 +366,9 @@
bool useCondMask;
int lastDx, lastDy;
+ if (_vm->_heversion >= 90)
+ _shadow_mode = 0;
+
lastDx = lastDy = 0;
for (i = 0; i < 32; ++i) {
heCondMaskIndex[i] = i;
@@ -464,9 +467,6 @@
_ymove -= lastDy;
}
- if (_vm->_heversion >= 90)
- _shadow_mode = 0;
-
if (!useCondMask || !akct) {
decflag = 1;
} else {
Index: room.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/room.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- room.cpp 4 Feb 2006 12:11:09 -0000 1.28
+++ room.cpp 5 Feb 2006 06:32:16 -0000 1.29
@@ -515,7 +515,7 @@
// Color cycling
// HE 7.0 games load resources but don't use them.
- if (_version >= 4 && _heversion <= 60) {
+ if (_version >= 4 && _heversion <= 61) {
ptr = findResourceData(MKID('CYCL'), roomptr);
if (ptr) {
initCycl(ptr);
More information about the Scummvm-git-logs
mailing list