diff options
| author | Travis Howell | 2004-08-30 09:43:21 +0000 |
|---|---|---|
| committer | Travis Howell | 2004-08-30 09:43:21 +0000 |
| commit | 8b34cb4a6a95180758c0fcfbc1ce65934f0c0cb0 (patch) | |
| tree | 6a83da8ac8af5c410aeecbefb49cf29c70116c08 /scumm | |
| parent | ad56456e7b1b9444ec04b1a799d4af15ede15719 (diff) | |
| download | scummvm-rg350-8b34cb4a6a95180758c0fcfbc1ce65934f0c0cb0.tar.gz scummvm-rg350-8b34cb4a6a95180758c0fcfbc1ce65934f0c0cb0.tar.bz2 scummvm-rg350-8b34cb4a6a95180758c0fcfbc1ce65934f0c0cb0.zip | |
HE 7.0+ games don'yt use imuse
svn-id: r14837
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/scumm.cpp | 4 | ||||
| -rw-r--r-- | scumm/sound.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp index 1718870855..11d8534c1c 100644 --- a/scumm/scumm.cpp +++ b/scumm/scumm.cpp @@ -884,7 +884,7 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const ScummGameS _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 @@ void ScummEngine::launch() { else if (_gameId == GID_WATER) _numActors = 61; else - _numActors = 13; + _numActors = 80; if (_version >= 7) OF_OWNER_ROOM = 0xFF; diff --git a/scumm/sound.cpp b/scumm/sound.cpp index 5284db1084..e91e55c57b 100644 --- a/scumm/sound.cpp +++ b/scumm/sound.cpp @@ -756,8 +756,8 @@ int Sound::isSoundRunning(int sound) const { // 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)); } } |