aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra
diff options
context:
space:
mode:
authorJohannes Schickel2009-08-19 07:12:33 +0000
committerJohannes Schickel2009-08-19 07:12:33 +0000
commit5e92db60010d2545daf9673d2aeb97e11782fe01 (patch)
tree40f71e7eb5ef93719e5f5f890dcfcba92620f21c /engines/kyra
parent2ea0df7b2e14264b828b5d7fe7e55565a6c0bfa8 (diff)
downloadscummvm-rg350-5e92db60010d2545daf9673d2aeb97e11782fe01.tar.gz
scummvm-rg350-5e92db60010d2545daf9673d2aeb97e11782fe01.tar.bz2
scummvm-rg350-5e92db60010d2545daf9673d2aeb97e11782fe01.zip
Skip the whole Lore of the Lands special when the user does any input, like the original did.
svn-id: r43527
Diffstat (limited to 'engines/kyra')
-rw-r--r--engines/kyra/sequences_lol.cpp12
1 files changed, 5 insertions, 7 deletions
diff --git a/engines/kyra/sequences_lol.cpp b/engines/kyra/sequences_lol.cpp
index c1ceba34e9..54a882d9e2 100644
--- a/engines/kyra/sequences_lol.cpp
+++ b/engines/kyra/sequences_lol.cpp
@@ -875,20 +875,15 @@ void HistoryPlayer::play() {
while (sound->voiceIsPlaying() && !_vm->shouldQuit() && !_vm->skipFlag())
_vm->delay(10);
- if (_vm->skipFlag()) {
+ if (_vm->skipFlag())
sound->voiceStop();
- _vm->resetSkipFlag();
- }
++voiceFilename[4];
}
-
- if (_vm->skipFlag())
- _vm->resetSkipFlag();
}
if (_vm->skipFlag())
- _vm->resetSkipFlag();
+ _vm->_eventList.clear();
pal.fill(0, 256, 63);
if (_fireWsa->opened())
@@ -899,6 +894,9 @@ void HistoryPlayer::play() {
_screen->clearPage(0);
pal.fill(0, 256, 0);
_screen->fadePalette(pal, 0x3C);
+
+ if (_vm->skipFlag())
+ _vm->_eventList.clear();
}
void HistoryPlayer::loadWsa(const char *filename) {