[Scummvm-cvs-logs] SF.net SVN: scummvm:[35424] scummvm/trunk/engines/kyra
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Thu Dec 18 19:46:24 CET 2008
Revision: 35424
http://scummvm.svn.sourceforge.net/scummvm/?rev=35424&view=rev
Author: lordhoto
Date: 2008-12-18 18:46:24 +0000 (Thu, 18 Dec 2008)
Log Message:
-----------
Cleanup.
Modified Paths:
--------------
scummvm/trunk/engines/kyra/kyra_lok.cpp
scummvm/trunk/engines/kyra/sequences_lok.cpp
Modified: scummvm/trunk/engines/kyra/kyra_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_lok.cpp 2008-12-18 16:38:28 UTC (rev 35423)
+++ scummvm/trunk/engines/kyra/kyra_lok.cpp 2008-12-18 18:46:24 UTC (rev 35424)
@@ -468,9 +468,6 @@
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 @@
}
if (skipFlag())
- _sound->voiceStop();
+ snd_stopVoice();
} while (!skipFlag() && _system->getMillis() < start + amount && !shouldQuit());
}
Modified: scummvm/trunk/engines/kyra/sequences_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sequences_lok.cpp 2008-12-18 16:38:28 UTC (rev 35423)
+++ scummvm/trunk/engines/kyra/sequences_lok.cpp 2008-12-18 18:46:24 UTC (rev 35424)
@@ -1045,8 +1045,10 @@
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();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list