[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.57,1.58

[Max Horn]

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

Modified Files:
	resource.cpp 
Log Message:
made unblocked games get a little farther before crashing

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- resource.cpp	29 Mar 2003 15:56:42 -0000	1.57
+++ resource.cpp	11 Apr 2003 11:40:35 -0000	1.58
@@ -422,15 +422,15 @@
 	else
 		num = _fileHandle.readByte();
 
-	if (1 || _features & GF_AFTER_V6) {
-		if (num != res.num[id]) {
-			error("Invalid number of %ss (%d) in directory", name, num);
-		}
-	} else {
+	if (_features & GF_OLD_BUNDLE) {
 		if (num >= 0xFF) {
 			error("Too many %ss (%d) in directory", name, num);
 		}
 		allocResTypeData(id, tag, num, name, 1);
+	} else {
+		if (num != res.num[id]) {
+			error("Invalid number of %ss (%d) in directory", name, num);
+		}
 	}
 
 	if (_features & GF_OLD_BUNDLE) {