[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.66,1.67

Jonathan Gray khalek at users.sourceforge.net
Thu May 1 04:41:10 CEST 2003


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

Modified Files:
	resource.cpp 
Log Message:
unbreak costumes in most games

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- resource.cpp	1 May 2003 11:03:41 -0000	1.66
+++ resource.cpp	1 May 2003 11:40:21 -0000	1.67
@@ -560,8 +560,12 @@
 
 	// FIXME - TODO: This check used to be "i==0". However, that causes
 	// problems when using this function to ensure charset 0 is loaded.
-	// Quesetion: Why was this check like that in the first place?
-	if (i < 0)
+	// Question: Why was this check like that in the first place?
+	// Answer: costumes with an index of zero in the newer games at least
+	// TODO: determine after what version this behaviour changes...
+	if ((_gameId == GID_ZAK256) && (i < 0))
+		return;
+	else if (i == 0)
 		return;
 
 	if (i <= res.num[type])





More information about the Scummvm-git-logs mailing list