[Scummvm-cvs-logs] CVS: scummvm/queen resource.cpp,1.20,1.21

[Joost Peters]

Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1:/tmp/cvs-serv11970/queen

Modified Files:
	resource.cpp 
Log Message:
cleanup

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/resource.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- resource.cpp	28 Oct 2003 12:42:35 -0000	1.20
+++ resource.cpp	28 Oct 2003 13:27:37 -0000	1.21
@@ -142,23 +142,17 @@
 }
 
 uint8 *Resource::loadFile(const char *filename, uint32 skipBytes, byte *dstBuf) {
-	uint32 size = fileSize(filename);
+	uint32 size = fileSize(filename) - skipBytes;
 	if (dstBuf == NULL) 
 		dstBuf = new byte[size];
 	// skip 'skipBytes' bytes (useful for headers)
 	_resourceFile->seek(fileOffset(filename) + skipBytes, SEEK_SET);
-	_resourceFile->read(dstBuf, size - skipBytes);
+	_resourceFile->read(dstBuf, size);
 	return dstBuf;
 }
 
 uint8 *Resource::loadFileMalloc(const char *filename, uint32 skipBytes, byte *dstBuf) {
-	uint32 size = fileSize(filename);
-	if (dstBuf == NULL)
-		dstBuf = (byte *)malloc(size);
-	// skip 'skipBytes' bytes (useful for headers)
-	_resourceFile->seek(fileOffset(filename) + skipBytes, SEEK_SET);
-	_resourceFile->read(dstBuf, size - skipBytes);
-	return dstBuf;
+	return loadFile(filename, skipBytes, (byte *)malloc(fileSize(filename) - skipBytes));
 }
 
 bool Resource::exists(const char *filename) {