diff options
author | Florian Kagerer | 2009-09-16 20:05:12 +0000 |
---|---|---|
committer | Florian Kagerer | 2009-09-16 20:05:12 +0000 |
commit | 811596fde2cc1e84d02892a082b5056f7d8a6b84 (patch) | |
tree | 3b7bfbf32af6bad86019056b320529beced231ef /engines/kyra | |
parent | 65eeeffe7028e61af9d170afc0793d1981cab424 (diff) | |
download | scummvm-rg350-811596fde2cc1e84d02892a082b5056f7d8a6b84.tar.gz scummvm-rg350-811596fde2cc1e84d02892a082b5056f7d8a6b84.tar.bz2 scummvm-rg350-811596fde2cc1e84d02892a082b5056f7d8a6b84.zip |
LOL/Floppy: fixed outro
svn-id: r44116
Diffstat (limited to 'engines/kyra')
-rw-r--r-- | engines/kyra/script_tim.cpp | 2 | ||||
-rw-r--r-- | engines/kyra/sequences_lol.cpp | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/engines/kyra/script_tim.cpp b/engines/kyra/script_tim.cpp index ac106113e1..dad8e28978 100644 --- a/engines/kyra/script_tim.cpp +++ b/engines/kyra/script_tim.cpp @@ -308,7 +308,7 @@ void TIMInterpreter::displayText(uint16 textId, int16 flags) { } const bool isPC98 = (_vm->gameFlags().platform == Common::kPlatformPC98); - if (filename[0] && (_vm->speechEnabled() || isPC98)) + if (filename[0] && (_vm->speechEnabled() || !_vm->gameFlags().isTalkie)) _vm->sound()->voicePlay(filename); if (text[0] == '$') diff --git a/engines/kyra/sequences_lol.cpp b/engines/kyra/sequences_lol.cpp index 3b061e5062..769ebacb38 100644 --- a/engines/kyra/sequences_lol.cpp +++ b/engines/kyra/sequences_lol.cpp @@ -1010,7 +1010,11 @@ void LoLEngine::setupEpilogueData(bool load) { "FINALE.PAK", "FINALE1.PAK", "FINALE2.PAK", 0 }; - const char * const *fileList = _flags.isTalkie ? fileListCD : 0; + static const char * const fileListFloppy[] = { + "GENERAL.PAK", "INTRO.PAK", "FINALE1.PAK", "FINALE2.PAK", 0 + }; + + const char * const *fileList = _flags.isTalkie ? fileListCD : fileListFloppy; assert(fileList); char filename[32]; |