diff options
| author | Florian Kagerer | 2009-11-15 23:26:47 +0000 |
|---|---|---|
| committer | Florian Kagerer | 2009-11-15 23:26:47 +0000 |
| commit | 3013a63890679bfb7be9aa7d7398935c23751307 (patch) | |
| tree | 3e658935cfb8d8acac37544d295f6f47b2eabe7d | |
| parent | 737f9312e5c9f2974880314cd3c69d437ed2b69d (diff) | |
| download | scummvm-rg350-3013a63890679bfb7be9aa7d7398935c23751307.tar.gz scummvm-rg350-3013a63890679bfb7be9aa7d7398935c23751307.tar.bz2 scummvm-rg350-3013a63890679bfb7be9aa7d7398935c23751307.zip | |
LOL: fixed minor glitch in the ending sequence
svn-id: r45933
| -rw-r--r-- | engines/kyra/script_tim.cpp | 2 | ||||
| -rw-r--r-- | engines/kyra/sound_towns.cpp | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/engines/kyra/script_tim.cpp b/engines/kyra/script_tim.cpp index e4e834b86f..764cc445b3 100644 --- a/engines/kyra/script_tim.cpp +++ b/engines/kyra/script_tim.cpp @@ -734,7 +734,7 @@ int TIMInterpreter::cmd_loadVocFile(const uint16 *param) { _vocFiles[index] = (const char *)(_currentTim->text + READ_LE_UINT16(_currentTim->text + (stringId << 1))); - if (index == 2 && _currentTim->isLoLOutro) { + if (index == 2 && _currentTim->isLoLOutro && _vm->gameFlags().isTalkie) { _vocFiles[index] = "CONGRATA.VOC"; switch (_currentTim->lolCharacter) { diff --git a/engines/kyra/sound_towns.cpp b/engines/kyra/sound_towns.cpp index aa8de56d1a..9fe502e2c2 100644 --- a/engines/kyra/sound_towns.cpp +++ b/engines/kyra/sound_towns.cpp @@ -4172,10 +4172,13 @@ void SoundTownsPC98_v2::playTrack(uint8 track) { beginFadeOut(); char musicfile[13]; - if (fileListLen() == 1) + if (fileListLen() == 1) { sprintf(musicfile, fileListEntry(0), track); - else + } else { strcpy(musicfile, fileListEntry(track)); + if (!musicfile[0]) + return; + } delete[] _musicTrackData; _musicTrackData = _vm->resource()->fileData(musicfile, 0); |