diff options
| author | Johannes Schickel | 2008-12-18 18:46:24 +0000 | 
|---|---|---|
| committer | Johannes Schickel | 2008-12-18 18:46:24 +0000 | 
| commit | d15022da78454489915afcdb270130bf64d0b92e (patch) | |
| tree | 1e5785c0cdcab778cccc01e26fee2442583450ec | |
| parent | 5b7cb7ae3e3e6e6404c1dd9153822c59b659b91e (diff) | |
| download | scummvm-rg350-d15022da78454489915afcdb270130bf64d0b92e.tar.gz scummvm-rg350-d15022da78454489915afcdb270130bf64d0b92e.tar.bz2 scummvm-rg350-d15022da78454489915afcdb270130bf64d0b92e.zip  | |
Cleanup.
svn-id: r35424
| -rw-r--r-- | engines/kyra/kyra_lok.cpp | 5 | ||||
| -rw-r--r-- | engines/kyra/sequences_lok.cpp | 2 | 
2 files changed, 3 insertions, 4 deletions
diff --git a/engines/kyra/kyra_lok.cpp b/engines/kyra/kyra_lok.cpp index 5829aeb10a..c0ae2d64fc 100644 --- a/engines/kyra/kyra_lok.cpp +++ b/engines/kyra/kyra_lok.cpp @@ -468,9 +468,6 @@ void KyraEngine_LoK::delay(uint32 amount, bool update, bool isMainLoop) {  	uint32 start = _system->getMillis();  	do { -				/*} else if (event.kbd.keycode == '.') { -				} else if (event.kbd.keycode == Common::KEYCODE_RETURN || event.kbd.keycode == Common::KEYCODE_SPACE || event.kbd.keycode == Common::KEYCODE_ESCAPE) { -					_abortIntroFlag = true;*/  		if (update) {  			_sprites->updateSceneAnims();  			_animator->updateAllObjectShapes(); @@ -499,7 +496,7 @@ void KyraEngine_LoK::delay(uint32 amount, bool update, bool isMainLoop) {  		}  		if (skipFlag()) -			_sound->voiceStop(); +			snd_stopVoice();  	} while (!skipFlag() && _system->getMillis() < start + amount && !shouldQuit());  } diff --git a/engines/kyra/sequences_lok.cpp b/engines/kyra/sequences_lok.cpp index e072b84876..6b17ef44e0 100644 --- a/engines/kyra/sequences_lok.cpp +++ b/engines/kyra/sequences_lok.cpp @@ -1045,8 +1045,10 @@ void KyraEngine_LoK::seq_playEnding() {  	memset(_screen->getPalette(2), 0, sizeof(uint8)*768);  	_screen->setScreenPalette(_screen->getPalette(2)); +	_seqPlayerFlag = true;  	_seq->playSequence(_seq_Reunion, false);  	_screen->fadeToBlack(); +	_seqPlayerFlag = false;  	_screen->showMouse();  	seq_playCredits();  | 
