[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.37,1.38

Max Horn fingolfin at users.sourceforge.net
Mon Dec 23 18:04:03 CET 2002


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

Modified Files:
	resource.cpp 
Log Message:
upon res load error, print out from which file we tried to load, and also print the correc index (was 'type' instead of 'idx')

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- resource.cpp	23 Dec 2002 19:03:07 -0000	1.37
+++ resource.cpp	24 Dec 2002 02:03:35 -0000	1.38
@@ -519,7 +519,7 @@
 	uint32 fileOffs;
 	uint32 size, tag;
 
-	//debug(1, "loadResource(%s,%d)", resTypeFromId(type),idx);
+	debug(1, "loadResource(%s,%d)", resTypeFromId(type),idx);
 
 	if (type == rtCharset && (_features & GF_SMALL_HEADER)) {
 		loadCharset(idx);
@@ -567,7 +567,9 @@
 		tag = fileReadDword();
 
 		if (tag != res.tags[type]) {
-			error("%s %d not in room %d at %d+%d", res.name[type], type, roomNr, _fileOffset, fileOffs);
+			error("%s %d not in room %d at %d+%d in file %s",
+					res.name[type], idx, roomNr,
+					_fileOffset, fileOffs, _fileHandle.name());
 		}
 
 		size = _fileHandle.readUint32BE();





More information about the Scummvm-git-logs mailing list