diff options
author | Nicola Mettifogo | 2007-03-10 13:05:13 +0000 |
---|---|---|
committer | Nicola Mettifogo | 2007-03-10 13:05:13 +0000 |
commit | cd366dd78cd6d1ee65f8dc82cb9287b5eeed33d0 (patch) | |
tree | f8884641570864a86f4c7149b662e351b673684d | |
parent | c7ce7ec614213f5d30d02b08bd98da8947b9dc32 (diff) | |
download | scummvm-rg350-cd366dd78cd6d1ee65f8dc82cb9287b5eeed33d0.tar.gz scummvm-rg350-cd366dd78cd6d1ee65f8dc82cb9287b5eeed33d0.tar.bz2 scummvm-rg350-cd366dd78cd6d1ee65f8dc82cb9287b5eeed33d0.zip |
got rid of calls to close() since streams and archives clean after themselves
svn-id: r26051
-rw-r--r-- | engines/parallaction/disk.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/engines/parallaction/disk.cpp b/engines/parallaction/disk.cpp index d7845eca2a..387499a51a 100644 --- a/engines/parallaction/disk.cpp +++ b/engines/parallaction/disk.cpp @@ -32,7 +32,6 @@ Disk::Disk(Parallaction* vm) : _vm(vm) { } Disk::~Disk() { - _archive.close(); } @@ -99,8 +98,6 @@ void Disk::loadExternalCnv(const char *filename, Cnv *cnv) { stream.read(cnv->_array[i], size); } - stream.close(); - // printf("done\n"); @@ -129,8 +126,6 @@ void Disk::loadExternalStaticCnv(const char *filename, StaticCnv *cnv) { cnv->_data0 = (byte*)malloc(size); stream.read(cnv->_data0, size); - stream.close(); - return; } @@ -170,8 +165,6 @@ void Disk::loadCnv(const char *filename, Cnv *cnv) { s += read; } - _archive.closeArchivedFile(); - free(buf); return; @@ -220,8 +213,6 @@ Script* Disk::loadLocation(const char *name) { strcat(archivefile, name); strcat(archivefile, ".loc"); - _archive.close(); - _vm->_languageDir[2] = '\0'; _archive.open(_vm->_languageDir); _vm->_languageDir[2] = '/'; @@ -324,7 +315,6 @@ void Disk::loadStatic(const char* name, StaticCnv* cnv) { cnv->_data0 = (byte*)malloc(size); _archive.read(compressed, compressedsize); - _archive.closeArchivedFile(); decompressChunk(compressed, cnv->_data0, size); free(compressed); @@ -443,7 +433,6 @@ void Disk::loadScenery(const char *name, const char *mask) { } void Disk::selectArchive(const char *name) { - _archive.close(); _archive.open(name); } |