diff options
author | Jordi Vilalta Prat | 2008-05-06 03:00:26 +0000 |
---|---|---|
committer | Jordi Vilalta Prat | 2008-05-06 03:00:26 +0000 |
commit | 38a8aa516e0fa315e318801e5399f82e51efa8df (patch) | |
tree | c6f7bc89fe2340a846ef891cefc9031cfdb32ec9 /engines/scumm/sound.cpp | |
parent | 3ac46924e311afb6b02615af04556da823c4f3f3 (diff) | |
download | scummvm-rg350-38a8aa516e0fa315e318801e5399f82e51efa8df.tar.gz scummvm-rg350-38a8aa516e0fa315e318801e5399f82e51efa8df.tar.bz2 scummvm-rg350-38a8aa516e0fa315e318801e5399f82e51efa8df.zip |
Allow static and dynamic plugins to be used at the same time
svn-id: r31888
Diffstat (limited to 'engines/scumm/sound.cpp')
-rw-r--r-- | engines/scumm/sound.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp index d7e3ec1508..fdd0598378 100644 --- a/engines/scumm/sound.cpp +++ b/engines/scumm/sound.cpp @@ -675,7 +675,7 @@ void Sound::startTalkSound(uint32 offset, uint32 b, int mode, Audio::SoundHandle } if (_vm->_imuseDigital) { -#ifndef DISABLE_SCUMM_7_8 +#ifdef ENABLE_SCUMM_7_8 //_vm->_imuseDigital->stopSound(kTalkSoundID); _vm->_imuseDigital->startVoice(kTalkSoundID, input); #endif @@ -688,7 +688,7 @@ void Sound::startTalkSound(uint32 offset, uint32 b, int mode, Audio::SoundHandle void Sound::stopTalkSound() { if (_sfxMode & 2) { if (_vm->_imuseDigital) { -#ifndef DISABLE_SCUMM_7_8 +#ifdef ENABLE_SCUMM_7_8 _vm->_imuseDigital->stopSound(kTalkSoundID); #endif } else if (_vm->_game.heversion >= 60) { @@ -718,7 +718,7 @@ bool Sound::isMouthSyncOff(uint pos) { } int Sound::isSoundRunning(int sound) const { -#ifndef DISABLE_SCUMM_7_8 +#ifdef ENABLE_SCUMM_7_8 if (_vm->_imuseDigital) return (_vm->_imuseDigital->getSoundStatus(sound) != 0); #endif @@ -754,7 +754,7 @@ int Sound::isSoundRunning(int sound) const { */ bool Sound::isSoundInUse(int sound) const { -#ifndef DISABLE_SCUMM_7_8 +#ifdef ENABLE_SCUMM_7_8 if (_vm->_imuseDigital) return (_vm->_imuseDigital->getSoundStatus(sound) != 0); #endif @@ -848,7 +848,7 @@ void Sound::stopAllSounds() { void Sound::soundKludge(int *list, int num) { int i; -#ifndef DISABLE_SCUMM_7_8 +#ifdef ENABLE_SCUMM_7_8 if (_vm->_imuseDigital) { _vm->_imuseDigital->parseScriptCmds(list[0], list[1], list[2], list[3], list[4], list[5], list[6], list[7]); @@ -912,7 +912,7 @@ void Sound::pauseSounds(bool pause) { _soundsPaused = pause; -#ifndef DISABLE_SCUMM_7_8 +#ifdef ENABLE_SCUMM_7_8 if (_vm->_imuseDigital) { _vm->_imuseDigital->pause(pause); } |