[Scummvm-cvs-logs] SF.net SVN: scummvm: [23617] scummvm/trunk/engines/kyra
eriktorbjorn at users.sourceforge.net
eriktorbjorn at users.sourceforge.net
Sat Jul 29 07:59:48 CEST 2006
Revision: 23617
Author: eriktorbjorn
Date: 2006-07-28 22:59:44 -0700 (Fri, 28 Jul 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=23617&view=rev
Log Message:
-----------
Added _quitFlag test to Kyra 2 animation and to waitForEvent().
Modified Paths:
--------------
scummvm/trunk/engines/kyra/kyra.cpp
scummvm/trunk/engines/kyra/kyra2.cpp
Modified: scummvm/trunk/engines/kyra/kyra.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra.cpp 2006-07-28 17:42:33 UTC (rev 23616)
+++ scummvm/trunk/engines/kyra/kyra.cpp 2006-07-29 05:59:44 UTC (rev 23617)
@@ -652,7 +652,7 @@
void KyraEngine::waitForEvent() {
bool finished = false;
OSystem::Event event;
- while (!finished) {
+ while (!finished && !_quitFlag) {
while (_system->pollEvent(event)) {
switch (event.type) {
case OSystem::EVENT_KEYDOWN:
Modified: scummvm/trunk/engines/kyra/kyra2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra2.cpp 2006-07-28 17:42:33 UTC (rev 23616)
+++ scummvm/trunk/engines/kyra/kyra2.cpp 2006-07-29 05:59:44 UTC (rev 23617)
@@ -36,17 +36,17 @@
KyraEngine_v2::~KyraEngine_v2() {
}
-int KyraEngine_v2::go() {
+int KyraEngine_v2::go() {
uint8 pal[768];
-
+
WSAMovieV2 *title = new WSAMovieV2(this);
title->open("title.WSA", 0, pal);
assert(title->opened());
-
+
_screen->setScreenPalette(pal);
title->setX(0); title->setY(0);
title->setDrawPage(0);
- for (int i = 0; i < 26; ++i) {
+ for (int i = 0; i < 26 && !_quitFlag; ++i) {
uint32 nextRun = _system->getMillis() + 6 * _tickLength;
title->displayFrame(i);
_screen->updateScreen();
@@ -54,7 +54,7 @@
}
delete title;
-
+
waitForEvent();
return 0;
}
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