From d4f61e6ee91bc705fd781f0b5c2a7f9e55af80e4 Mon Sep 17 00:00:00 2001 From: Gregory Montoir Date: Fri, 24 Nov 2006 18:24:45 +0000 Subject: loadFile isn't called with useMalloc=true anymore, got rid of it svn-id: r24782 --- engines/queen/resource.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'engines/queen/resource.cpp') diff --git a/engines/queen/resource.cpp b/engines/queen/resource.cpp index 6f75439376..753ca1ff4e 100644 --- a/engines/queen/resource.cpp +++ b/engines/queen/resource.cpp @@ -107,7 +107,7 @@ ResourceEntry *Resource::resourceEntry(const char *filename) const { 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 @@ uint8 *Resource::loadFile(const char *filename, uint32 skipBytes, uint32 *size, *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; -- cgit v1.2.3