From 5e92db60010d2545daf9673d2aeb97e11782fe01 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Wed, 19 Aug 2009 07:12:33 +0000 Subject: Skip the whole Lore of the Lands special when the user does any input, like the original did. svn-id: r43527 --- engines/kyra/sequences_lol.cpp | 12 +++++------- 1 file 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) { -- cgit v1.2.3