[Scummvm-cvs-logs] CVS: residual/imuse imuse_mcmp_mgr.cpp,1.5,1.6 imuse_mcmp_mgr.h,1.2,1.3

Pawel Kolodziejski aquadran at users.sourceforge.net
Fri Dec 31 12:11:06 CET 2004


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

Modified Files:
	imuse_mcmp_mgr.cpp imuse_mcmp_mgr.h 
Log Message:
clenaup

Index: imuse_mcmp_mgr.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/imuse/imuse_mcmp_mgr.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- imuse_mcmp_mgr.cpp	31 Dec 2004 19:12:49 -0000	1.5
+++ imuse_mcmp_mgr.cpp	31 Dec 2004 20:10:08 -0000	1.6
@@ -30,29 +30,21 @@
 	_numCompItems = 0;
 	_curSample = -1;
 	_compInput = NULL;
+	_outputSize = 0;
 	_file = NULL;
+	_numCompItems = 0;
+	_lastBlock = -1;
 }
 
 McmpMgr::~McmpMgr() {
 	if (_file) {
 		fclose(_file);
-		_file = NULL;
 	}
-	_numCompItems = 0;
-	_compTableLoaded = false;
-	_lastBlock = -1;
-	_outputSize = 0;
-	_curSample = -1;
 	free(_compTable);
-	_compTable = NULL;
 	free(_compInput);
-	_compInput = NULL;
 }
 
 bool McmpMgr::openSound(const char *filename, byte **resPtr, int &offsetData) {
-	_outputSize = 0;
-	_lastBlock = -1;
-
 	_file = ResourceLoader::instance()->openNewStream(filename);
 
 	if (!_file) {
@@ -119,10 +111,6 @@
 		return 0;
 	}
 
-	if (!_compTableLoaded) {
-		return 0;
-	}
-
 	first_block = offset / 0x2000;
 	last_block = (offset + size - 1) / 0x2000;
 	skip = offset % 0x2000;

Index: imuse_mcmp_mgr.h
===================================================================
RCS file: /cvsroot/scummvm/residual/imuse/imuse_mcmp_mgr.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- imuse_mcmp_mgr.h	29 Dec 2004 06:32:07 -0000	1.2
+++ imuse_mcmp_mgr.h	31 Dec 2004 20:10:08 -0000	1.3
@@ -42,7 +42,6 @@
 	int16 _numCompItems;
 	int _curSample;
 	FILE *_file;
-	bool _compTableLoaded;
 	byte _compOutput[0x2000];
 	byte *_compInput;
 	int _outputSize;





More information about the Scummvm-git-logs mailing list