diff options
Diffstat (limited to 'engines/kyra/engine')
| -rw-r--r-- | engines/kyra/engine/chargen.cpp | 2 | ||||
| -rw-r--r-- | engines/kyra/engine/eobcommon.cpp | 4 | ||||
| -rw-r--r-- | engines/kyra/engine/eobcommon.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/engines/kyra/engine/chargen.cpp b/engines/kyra/engine/chargen.cpp index 7adca7f4da..2fc1586b35 100644 --- a/engines/kyra/engine/chargen.cpp +++ b/engines/kyra/engine/chargen.cpp @@ -637,7 +637,7 @@ int CharacterGenerator::getInput(Button *buttonList) { if (_vm->game() == GI_EOB1 && _vm->sound()->checkTrigger()) { _vm->sound()->resetTrigger(); _vm->snd_playSong(20); - } else if (_vm->game() == GI_EOB2 && !_vm->sound()->isPlaying()) { + } else if (_vm->game() == GI_EOB2 && _vm->gameFlags().platform != Common::kPlatformAmiga && !_vm->sound()->isPlaying()) { // WORKAROUND for EOB II: The original implements the same sound trigger check as in EOB I. // However, Westwood seems to have forgotten to set the trigger at the end of the AdLib song, // so that the music will not loop. We simply check whether the sound driver is still playing. diff --git a/engines/kyra/engine/eobcommon.cpp b/engines/kyra/engine/eobcommon.cpp index 7bd187ed15..26a23aac7f 100644 --- a/engines/kyra/engine/eobcommon.cpp +++ b/engines/kyra/engine/eobcommon.cpp @@ -2630,8 +2630,8 @@ void EoBCoreEngine::snd_stopSound() { _sound->stopAllSoundEffects(); } -void EoBCoreEngine::snd_fadeOut() { - _sound->beginFadeOut(); +void EoBCoreEngine::snd_fadeOut(int delay) { + _sound->beginFadeOut(delay); } } // End of namespace Kyra diff --git a/engines/kyra/engine/eobcommon.h b/engines/kyra/engine/eobcommon.h index c7f3fbcb14..3566ea4345 100644 --- a/engines/kyra/engine/eobcommon.h +++ b/engines/kyra/engine/eobcommon.h @@ -1179,7 +1179,7 @@ protected: void snd_playSong(int id); void snd_playSoundEffect(int id, int volume=0xFF); void snd_stopSound(); - void snd_fadeOut(); + void snd_fadeOut(int speed = 160); // keymap static const char *const kKeymapName; |