[Scummvm-cvs-logs] SF.net SVN: scummvm: [24782] scummvm/trunk/engines/queen

[cyx at users.sourceforge.net]

Revision: 24782
          http://svn.sourceforge.net/scummvm/?rev=24782&view=rev
Author:   cyx
Date:     2006-11-24 10:24:45 -0800 (Fri, 24 Nov 2006)

Log Message:
-----------
loadFile isn't called with useMalloc=true anymore, got rid of it

Modified Paths:
--------------
    scummvm/trunk/engines/queen/resource.cpp
    scummvm/trunk/engines/queen/resource.h

Modified: scummvm/trunk/engines/queen/resource.cpp
===================================================================
--- scummvm/trunk/engines/queen/resource.cpp	2006-11-24 18:18:48 UTC (rev 24781)
+++ scummvm/trunk/engines/queen/resource.cpp	2006-11-24 18:24:45 UTC (rev 24782)
@@ -107,7 +107,7 @@
 	return re;
 }
 
-uint8 *Resource::loadFile(const char *filename, uint32 skipBytes, uint32 *size, bool useMalloc) {
+uint8 *Resource::loadFile(const char *filename, uint32 skipBytes, uint32 *size) {
 	ResourceEntry *re = resourceEntry(filename);
 	assert(re != NULL);
 	uint32 sz = re->size - skipBytes;
@@ -115,13 +115,7 @@
 		*size = sz;
 	}
 
-	byte *dstBuf;
-	if (useMalloc) {
-		dstBuf = (byte *)malloc(sz);
-	} else {
-		dstBuf = new byte[sz];
-	}
-
+	byte *dstBuf = new byte[sz];
 	_resourceFile.seek(re->offset + skipBytes);
 	_resourceFile.read(dstBuf, sz);
 	return dstBuf;

Modified: scummvm/trunk/engines/queen/resource.h
===================================================================
--- scummvm/trunk/engines/queen/resource.h	2006-11-24 18:18:48 UTC (rev 24781)
+++ scummvm/trunk/engines/queen/resource.h	2006-11-24 18:24:45 UTC (rev 24782)
@@ -65,7 +65,7 @@
 	~Resource();
 
 	//! loads the specified from the resource file
-	uint8 *loadFile(const char *filename, uint32 skipBytes = 0, uint32 *size = NULL, bool useMalloc = false);
+	uint8 *loadFile(const char *filename, uint32 skipBytes = 0, uint32 *size = NULL);
 
 	//! returns true if the file is present in the resource
 	bool fileExists(const char *filename) const { return resourceEntry(filename) != NULL; }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.