libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-23 02:11:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

HE 7.0+ games don'yt use imuse

Browse Source 
svn-id: r14837
This commit is contained in:
Travis Howell 2004-08-30 09:43:21 +00:00
parent ad56456e7b
commit 8b34cb4a6a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scumm/scumm.cpp
View File

@ -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;

4
scumm/sound.cpp
View File

@ -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));
}
}