[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.312,2.313

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv26234/scumm

Modified Files:
	scummvm.cpp 
Log Message:
cleanup

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.312
retrieving revision 2.313
diff -u -d -r2.312 -r2.313
--- scummvm.cpp	5 Aug 2003 15:52:53 -0000	2.312
+++ scummvm.cpp	5 Aug 2003 17:50:06 -0000	2.313
@@ -612,24 +612,19 @@
 	_mixer->setMusicVolume(kDefaultMusicVolume);
 
 	// Init iMuse
+	_imuse = NULL;
+	_imuseDigital = NULL;
+	_playerV2 = NULL;
 	if (_features & GF_DIGI_IMUSE) {
 		_imuseDigital = new IMuseDigital(this);
-		_imuse = NULL;
-		_playerV2 = NULL;
 	} else if ((_features & GF_AMIGA) && (_features & GF_OLD_BUNDLE)) {
 		_playerV2 = NULL;
-		_imuse = NULL;
-		_imuseDigital = NULL;
 	} else if (_features & GF_OLD_BUNDLE) {
 		if ((_version == 1) && (_gameId == GID_MANIAC))
 			_playerV2 = NULL;
 		else
 			_playerV2 = new Player_V2(this);
-		_imuse = NULL;
-		_imuseDigital = NULL;
 	} else {
-		_playerV2 = NULL;
-		_imuseDigital = NULL;
 		_imuse = IMuse::create (syst, detector->createMidi());
 		if (_imuse) {
 			if (detector->_gameTempo != 0)