diff options
| author | Eugene Sandulenko | 2005-04-13 00:11:49 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2005-04-13 00:11:49 +0000 |
| commit | bdbd56406c20dfa7425a71de22999cc92065ce77 (patch) | |
| tree | 0b3cc6d6c63ecac48ac9fed8170004a00cab195d /scumm/scumm.cpp | |
| parent | 3536cd0aa2d9ade01d7f5bf0c19c6a573739a398 (diff) | |
| download | scummvm-rg350-bdbd56406c20dfa7425a71de22999cc92065ce77.tar.gz scummvm-rg350-bdbd56406c20dfa7425a71de22999cc92065ce77.tar.bz2 scummvm-rg350-bdbd56406c20dfa7425a71de22999cc92065ce77.zip | |
Patches #1164217 "Updated GS Support + Percussion Remapping Patch" and
#1181750 "Updated Native MIDI documentation". Thanks _tom a lot.
svn-id: r17571
Diffstat (limited to 'scumm/scumm.cpp')
| -rw-r--r-- | scumm/scumm.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp index 98d968a8c7..bacc0a1020 100644 --- a/scumm/scumm.cpp +++ b/scumm/scumm.cpp @@ -1672,6 +1672,10 @@ void ScummEngine_v99he::scummInit() { void ScummEngine::setupMusic(int midi) { _midiDriver = MidiDriver::detectMusicDriver(midi); _native_mt32 = (ConfMan.getBool("native_mt32") || (_midiDriver == MD_MT32)); + if ((_gameId == GID_TENTACLE) || (_gameId == GID_SAMNMAX)) + _enable_gs = false; + else + _enable_gs = ConfMan.getBool("enable_gs"); #ifndef __GP32__ //ph0x FIXME, "quick dirty hack" /* Bind the mixer to the system => mixer will be invoked @@ -1720,6 +1724,7 @@ void ScummEngine::setupMusic(int midi) { if (ConfMan.hasKey("tempo")) _imuse->property(IMuse::PROP_TEMPO_BASE, ConfMan.getInt("tempo")); _imuse->property(IMuse::PROP_NATIVE_MT32, _native_mt32); + _imuse->property(IMuse::PROP_GS, _enable_gs); if (_features & GF_HUMONGOUS || midi == MDT_TOWNS) { _imuse->property(IMuse::PROP_LIMIT_PLAYERS, 1); _imuse->property(IMuse::PROP_RECYCLE_PLAYERS, 1); |