[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.160,1.161 sound.cpp,1.375,1.376

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25969/scumm

Modified Files:
	scumm.cpp sound.cpp 
Log Message:

HE 7.0+ games don'yt use imuse


Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -d -r1.160 -r1.161
--- scumm.cpp	30 Aug 2004 00:10:36 -0000	1.160
+++ scumm.cpp	30 Aug 2004 09:43:21 -0000	1.161
@@ -884,7 +884,7 @@
 		_musicEngine = NULL;
 	} else if (((_midiDriver == MD_PCJR) || (_midiDriver == MD_PCSPK)) && ((_version > 2) && (_version < 5))) {
 		_musicEngine = new Player_V2(this, _midiDriver != MD_PCSPK);
-	} else if (_version > 2) {
+	} else if (_version > 2 && _heversion <= 60) {
 		MidiDriver *driver = GameDetector::createMidi(_midiDriver);
 		if (driver && _native_mt32)
 			driver->property (MidiDriver::PROP_CHANNEL_MASK, 0x03FE);
@@ -1104,7 +1104,7 @@
 	else if (_gameId == GID_WATER)
 		_numActors = 61;
 	else 
-		_numActors = 13;
+		_numActors = 80;
 
 	if (_version >= 7)
 		OF_OWNER_ROOM = 0xFF;

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.375
retrieving revision 1.376
diff -u -d -r1.375 -r1.376
--- sound.cpp	29 Aug 2004 11:27:16 -0000	1.375
+++ sound.cpp	30 Aug 2004 09:43:21 -0000	1.376
@@ -756,8 +756,8 @@
 			// ID number of the first active music it finds.
 			if (_currentMusic)
 				return (_musicChannelHandle.isActive()) ? 1 : 0;
-			else
-				return _vm->_imuse->getSoundStatus(sound);
+			else if (_vm->_imuse)
+				return (_vm->_imuse->getSoundStatus(sound));
 		}
 	}