[Scummvm-cvs-logs] CVS: scummvm/scumm costume.cpp,1.97,1.98

Travis Howell kirben at users.sourceforge.net
Sun Aug 17 05:14:01 CEST 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv8275/scumm

Modified Files:
	costume.cpp 
Log Message:

Remove c64_ignorePakCols calls for v1 games, since they cause crashes and don't seem to be required.
Makes v1 maniac completable, maybe v1 zak too.


Index: costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/costume.cpp,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- costume.cpp	17 Aug 2003 05:46:48 -0000	1.97
+++ costume.cpp	17 Aug 2003 12:13:17 -0000	1.98
@@ -208,13 +208,9 @@
 		if (!use_scaling)
 			skip = -v1.x;
 		if (skip > 0) {
-			if (!newAmiCost) {
+			if (!newAmiCost && _vm->_version > 1) {
 				v1.skip_width -= skip;
-
-				if (_loaded._format == 0x57)
-					c64_ignorePakCols(skip);
-				else
-					codec1_ignorePakCols(skip);
+				codec1_ignorePakCols(skip);
 				v1.x = 0;
 			}
 		} else {
@@ -229,13 +225,9 @@
 		if (!use_scaling)
 			skip = x_right - _vm->_screenWidth;
 		if (skip > 0) {
-			if (!newAmiCost) {
+			if (!newAmiCost && _vm->_version > 1) {
 				v1.skip_width -= skip;
-
-				if (_loaded._format == 0x57)
-					c64_ignorePakCols(skip);
-				else
-					codec1_ignorePakCols(skip);
+				codec1_ignorePakCols(skip);
 				v1.x = _vm->_screenWidth - 1;
 			}
 		} else {





More information about the Scummvm-git-logs mailing list