aboutsummaryrefslogtreecommitdiff
path: root/scumm/scummvm.cpp
diff options
context:
space:
mode:
authorJonathan Gray2003-05-19 08:04:47 +0000
committerJonathan Gray2003-05-19 08:04:47 +0000
commit6cb61537f4749e83b7bbdd2294a28f07eb6eeb15 (patch)
treebe138c109324aa1a0ebf94c7ee733ac48da87e79 /scumm/scummvm.cpp
parent29fb3e308f32c853155c9400bc9df7d850c9b9b2 (diff)
downloadscummvm-rg350-6cb61537f4749e83b7bbdd2294a28f07eb6eeb15.tar.gz
scummvm-rg350-6cb61537f4749e83b7bbdd2294a28f07eb6eeb15.tar.bz2
scummvm-rg350-6cb61537f4749e83b7bbdd2294a28f07eb6eeb15.zip
enable midi for non puttdemo humongous games. need to properly return the result of whether music is running though...
svn-id: r7673
Diffstat (limited to 'scumm/scummvm.cpp')
-rw-r--r--scumm/scummvm.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp
index 036a99a3d7..c7e5da7cfb 100644
--- a/scumm/scummvm.cpp
+++ b/scumm/scummvm.cpp
@@ -687,6 +687,7 @@ void Scumm::scummInit() {
if (!(_features & GF_SMALL_NAMES) && !(_features & GF_AFTER_V8))
loadCharset(1);
+
if (_features & GF_OLD_BUNDLE)
loadCharset(0); // FIXME - HACK ?
@@ -818,9 +819,9 @@ 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) // FIXME uncomment when XMI support is added
-// VAR(VAR_SOUNDPARAM) = 1; // soundblaster for music
-// else
+ if ((_features & GF_HUMONGOUS) && (_gameId != GID_PUTTDEMO))
+ VAR(VAR_SOUNDPARAM) = 1; // soundblaster for music
+ else
VAR(VAR_SOUNDPARAM) = 0;
VAR(VAR_SOUNDPARAM2) = 0;
VAR(VAR_SOUNDPARAM3) = 0;