thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cleanup

Browse source 
svn-id: r10989
This commit is contained in:
Joost Peters 2003-10-28 13:27:37 +00:00
parent e02fe63f2e
commit 31a8ef2e7f
1 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
queen/resource.cpp
View file

@ -142,23 +142,17 @@ uint32 Resource::fileOffset(const char *filename) {
}
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) {