[Scummvm-cvs-logs] SF.net SVN: scummvm: [26051] scummvm/trunk/engines/parallaction/disk.cpp

[peres001 at users.sourceforge.net]

Revision: 26051
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26051&view=rev
Author:   peres001
Date:     2007-03-10 05:05:13 -0800 (Sat, 10 Mar 2007)

Log Message:
-----------
got rid of calls to close() since streams and archives clean after themselves

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/disk.cpp

Modified: scummvm/trunk/engines/parallaction/disk.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/disk.cpp	2007-03-10 11:16:16 UTC (rev 26050)
+++ scummvm/trunk/engines/parallaction/disk.cpp	2007-03-10 13:05:13 UTC (rev 26051)
@@ -32,7 +32,6 @@
 }
 
 Disk::~Disk() {
-	_archive.close();
 }
 
 
@@ -99,8 +98,6 @@
 		stream.read(cnv->_array[i], size);
 	}
 
-	stream.close();
-
 //	printf("done\n");
 
 
@@ -129,8 +126,6 @@
 	cnv->_data0 = (byte*)malloc(size);
 	stream.read(cnv->_data0, size);
 
-	stream.close();
-
 	return;
 }
 
@@ -170,8 +165,6 @@
 		s += read;
 	}
 
-	_archive.closeArchivedFile();
-
 	free(buf);
 
 	return;
@@ -220,8 +213,6 @@
 	strcat(archivefile, name);
 	strcat(archivefile, ".loc");
 
-	_archive.close();
-
 	_vm->_languageDir[2] = '\0';
 	_archive.open(_vm->_languageDir);
 	_vm->_languageDir[2] = '/';
@@ -324,7 +315,6 @@
 	cnv->_data0 = (byte*)malloc(size);
 
 	_archive.read(compressed, compressedsize);
-	_archive.closeArchivedFile();
 
 	decompressChunk(compressed, cnv->_data0, size);
 	free(compressed);
@@ -443,7 +433,6 @@
 }
 
 void Disk::selectArchive(const char *name) {
-	_archive.close();
 	_archive.open(name);
 }
 


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