diff options
Diffstat (limited to 'engines/kyra/engine/chargen.cpp')
| -rw-r--r-- | engines/kyra/engine/chargen.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/engines/kyra/engine/chargen.cpp b/engines/kyra/engine/chargen.cpp index 2ae9682ed2..7a4c9672c6 100644 --- a/engines/kyra/engine/chargen.cpp +++ b/engines/kyra/engine/chargen.cpp @@ -634,16 +634,20 @@ int CharacterGenerator::alignmentMenu(int cClass) { } int CharacterGenerator::getInput(Button *buttonList) { + if (_vm->gameFlags().platform == Common::kPlatformAmiga) + return _vm->checkInput(buttonList, false, 0); + if (_vm->game() == GI_EOB1 && _vm->sound()->checkTrigger()) { _vm->sound()->resetTrigger(); _vm->snd_playSong(20); - } else if (_vm->game() == GI_EOB2 && _vm->gameFlags().platform != Common::kPlatformAmiga && !_vm->sound()->isPlaying()) { + } else if (_vm->game() == GI_EOB2 && !_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. _vm->delay(3 * _vm->_tickLength); _vm->snd_playSong(13); } + return _vm->checkInput(buttonList, false, 0); } |