[Scummvm-cvs-logs] CVS: scummvm/sword1 resman.cpp,1.32.2.1,1.32.2.2

Robert Göffringmann lavosspawn at users.sourceforge.net
Tue Oct 25 22:37:24 CEST 2005


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

Modified Files:
      Tag: branch-0-8-0
	resman.cpp 
Log Message:
copied from CVS head:
include the datafile's name in error() message when I/O errors occur.

Index: resman.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/resman.cpp,v
retrieving revision 1.32.2.1
retrieving revision 1.32.2.2
diff -u -d -r1.32.2.1 -r1.32.2.2
--- resman.cpp	18 Oct 2005 02:11:27 -0000	1.32.2.1
+++ resman.cpp	26 Oct 2005 05:36:21 -0000	1.32.2.2
@@ -257,8 +257,9 @@
 		assert(clusFile);
 		clusFile->seek( resOffset(id) );
 		clusFile->read( memHandle->data, size);
-		if (clusFile->ioFailed())
-			error("Can't read %d bytes from cluster %d\n", size, id);
+		if (clusFile->ioFailed()) {
+			error("Can't read %d bytes from offset %d from cluster file %s\nResource ID: %d (%08X)\n", size, resOffset(id), _prj.clu[(id >> 24) - 1].label, id, id);
+		}
 	} else
 		_memMan->setCondition(memHandle, MEM_DONT_FREE);
 





More information about the Scummvm-git-logs mailing list