aboutsummaryrefslogtreecommitdiff
path: root/sky/sound.cpp
diff options
context:
space:
mode:
authorRobert Göffringmann2003-06-22 21:42:59 +0000
committerRobert Göffringmann2003-06-22 21:42:59 +0000
commitf891aceee307fa614fcd312b6f567792f1b95ae1 (patch)
tree90d90d5dfff3ce150c793cd534ddab6e63b012e2 /sky/sound.cpp
parent8595f30740beb3ed9d975f895578b19e18d2c223 (diff)
downloadscummvm-rg350-f891aceee307fa614fcd312b6f567792f1b95ae1.tar.gz
scummvm-rg350-f891aceee307fa614fcd312b6f567792f1b95ae1.tar.bz2
scummvm-rg350-f891aceee307fa614fcd312b6f567792f1b95ae1.zip
native mt32 support and basic control panel (incomplete)
doesn't work with all versions, probably file numbers were changed svn-id: r8632
Diffstat (limited to 'sky/sound.cpp')
-rw-r--r--sky/sound.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/sky/sound.cpp b/sky/sound.cpp
index ab7a866a63..b44cbc2fa8 100644
--- a/sky/sound.cpp
+++ b/sky/sound.cpp
@@ -1101,7 +1101,7 @@ void SkySound::fnPauseFx(void) {
}
bool SkySound::fnStartFx(uint32 sound) {
- if (sound < 256 || sound > MAX_FX_NUMBER || _sfxPaused)
+ if (sound < 256 || sound > MAX_FX_NUMBER || _sfxPaused || (SkyState::_systemVars.systemFlags & SF_FX_OFF))
return true;
uint8 screen = (uint8)(SkyLogic::_scriptVariables[SCREEN] & 0xff);