[Scummvm-cvs-logs] CVS: residual/imuse imuse_mcmp_mgr.cpp,1.4,1.5

Pawel Kolodziejski aquadran at users.sourceforge.net
Fri Dec 31 11:13:07 CET 2004


Update of /cvsroot/scummvm/residual/imuse
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5151/imuse

Modified Files:
	imuse_mcmp_mgr.cpp 
Log Message:
use diffrent file handles for one file

Index: imuse_mcmp_mgr.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/imuse/imuse_mcmp_mgr.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- imuse_mcmp_mgr.cpp	31 Dec 2004 18:17:21 -0000	1.4
+++ imuse_mcmp_mgr.cpp	31 Dec 2004 19:12:49 -0000	1.5
@@ -30,9 +30,14 @@
 	_numCompItems = 0;
 	_curSample = -1;
 	_compInput = NULL;
+	_file = NULL;
 }
 
 McmpMgr::~McmpMgr() {
+	if (_file) {
+		fclose(_file);
+		_file = NULL;
+	}
 	_numCompItems = 0;
 	_compTableLoaded = false;
 	_lastBlock = -1;
@@ -55,6 +60,10 @@
 		return false;
 	}
 
+	int filePos = ftell(_file);
+	_file = fdopen(fileno(_file), "rb");
+	fseek(_file, filePos, SEEK_SET);
+
 	uint32 tag;
 	fread(&tag, 1, 4, _file);
 	if (READ_BE_UINT32(&tag) != MKID_BE('MCMP')) {





More information about the Scummvm-git-logs mailing list