[Scummvm-cvs-logs] CVS: scummvm/scumm akos.cpp,1.236.2.12,1.236.2.13 room.cpp,1.25.2.2,1.25.2.3

kirben kirben at users.sourceforge.net
Sat Feb 4 22:33:10 CET 2006


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

Modified Files:
      Tag: branch-0-8-0
	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.236.2.12
retrieving revision 1.236.2.13
diff -u -d -r1.236.2.12 -r1.236.2.13
--- akos.cpp	4 Feb 2006 10:17:26 -0000	1.236.2.12
+++ akos.cpp	5 Feb 2006 06:32:25 -0000	1.236.2.13
@@ -365,6 +365,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;
@@ -466,9 +469,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.25.2.2
retrieving revision 1.25.2.3
diff -u -d -r1.25.2.2 -r1.25.2.3
--- room.cpp	18 Jan 2006 18:07:32 -0000	1.25.2.2
+++ room.cpp	5 Feb 2006 06:32:25 -0000	1.25.2.3
@@ -512,7 +512,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