aboutsummaryrefslogtreecommitdiff
path: root/scumm/scummvm.cpp
diff options
context:
space:
mode:
authorJamieson Christian2003-05-23 18:35:53 +0000
committerJamieson Christian2003-05-23 18:35:53 +0000
commiteb09051517e61b986f8d879e66e6f907a705729e (patch)
treeef8e409cddf6e6b38537cc58be2b844bfc23f589 /scumm/scummvm.cpp
parentad4eb360930972a00b8648173045b5d25def0883 (diff)
downloadscummvm-rg350-eb09051517e61b986f8d879e66e6f907a705729e.tar.gz
scummvm-rg350-eb09051517e61b986f8d879e66e6f907a705729e.tar.bz2
scummvm-rg350-eb09051517e61b986f8d879e66e6f907a705729e.zip
Added XMIDI support to IMuse. IMuse now plays music from Humongous games.
Added some IMuse property options to support some assumptions that seem to be made by Humongous games. This is still preliminary. It will play music, and it will switch between songs. But I don't know if it's switching to the right song at the right time. svn-id: r7869
Diffstat (limited to 'scumm/scummvm.cpp')
-rw-r--r--scumm/scummvm.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp
index 391d8dece1..fd5fa8a79f 100644
--- a/scumm/scummvm.cpp
+++ b/scumm/scummvm.cpp
@@ -614,6 +614,10 @@ Scumm::Scumm (GameDetector *detector, OSystem *syst)
_imuse->property (IMuse::PROP_OLD_ADLIB_INSTRUMENTS, (_features & GF_SMALL_HEADER) ? 1 : 0);
_imuse->property (IMuse::PROP_MULTI_MIDI, detector->_multi_midi);
_imuse->property (IMuse::PROP_NATIVE_MT32, detector->_native_mt32);
+ if (_features & GF_HUMONGOUS) {
+ _imuse->property (IMuse::PROP_LIMIT_PLAYERS, 1);
+ _imuse->property (IMuse::PROP_RECYCLE_PLAYERS, 1);
+ }
_imuse->set_music_volume(_sound->_sound_volume_music);
}
}
@@ -815,7 +819,7 @@ void Scumm::initScummVars() {
VAR(VAR_VIDEOMODE) = 0x13;
VAR(VAR_HEAPSPACE) = 1400;
VAR(VAR_MOUSEPRESENT) = true; // FIXME - used to be 0, but that seems odd?!?
- if ((_features & GF_HUMONGOUS) && (_gameId != GID_PUTTDEMO))
+ if (_features & GF_HUMONGOUS)
VAR(VAR_SOUNDPARAM) = 1; // soundblaster for music
else
VAR(VAR_SOUNDPARAM) = 0;