[Scummvm-cvs-logs] SF.net SVN: scummvm: [23594] scummvm/trunk/engines/kyra

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Wed Jul 26 07:27:40 CEST 2006


Revision: 23594
Author:   lordhoto
Date:     2006-07-25 22:27:34 -0700 (Tue, 25 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=23594&view=rev

Log Message:
-----------
Nicer quit handling in the intro sequences.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/seqplayer.cpp
    scummvm/trunk/engines/kyra/sequences_v1.cpp
Modified: scummvm/trunk/engines/kyra/seqplayer.cpp
===================================================================
--- scummvm/trunk/engines/kyra/seqplayer.cpp	2006-07-25 15:11:42 UTC (rev 23593)
+++ scummvm/trunk/engines/kyra/seqplayer.cpp	2006-07-26 05:27:34 UTC (rev 23594)
@@ -627,7 +627,7 @@
 		uint8 seqCode = *_seqData++;
 		if (seqCode < numCommands) {
 			SeqProc currentProc = commands[seqCode].proc;
-			debugC( 5, kDebugLevelSequence, "seqCode = %d (%s)", seqCode, commands[seqCode].desc);
+			debugC(5, kDebugLevelSequence, "seqCode = %d (%s)", seqCode, commands[seqCode].desc);
 			(this->*currentProc)();
 		} else {
 			error("Invalid sequence opcode %d", seqCode);

Modified: scummvm/trunk/engines/kyra/sequences_v1.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sequences_v1.cpp	2006-07-25 15:11:42 UTC (rev 23593)
+++ scummvm/trunk/engines/kyra/sequences_v1.cpp	2006-07-26 05:27:34 UTC (rev 23594)
@@ -135,19 +135,22 @@
 	_screen->updateScreen();
 	_screen->fadeFromBlack();
 	
-	if (_seq->playSequence(_seq_WestwoodLogo, _skipFlag)) {
+	if (_seq->playSequence(_seq_WestwoodLogo, _skipFlag) || _quitFlag) {
 		_screen->fadeToBlack();
 		_screen->clearPage(0);
 		return;
 	}
 	delay(60 * _tickLength);
-	if (_seq->playSequence(_seq_KyrandiaLogo, _skipFlag) && !seq_skipSequence()) {
+	if (_seq->playSequence(_seq_KyrandiaLogo, _skipFlag) && !seq_skipSequence() || _quitFlag) {
 		_screen->fadeToBlack();
 		_screen->clearPage(0);
 		return;
 	}
 	_screen->fillRect(0, 179, 319, 199, 0);
 
+	if (_quitFlag)
+		return;
+
 	int y1 = 8;
 	int h1 = 175;
 	int y2 = 176;
@@ -174,8 +177,11 @@
 		if (wait > 0) {
 			delay(wait);
 		}
-	} while (y2 >= 64);
+	} while (y2 >= 64 && !_quitFlag);
 
+	if (_quitFlag)
+		return;
+
 	_seq->playSequence(_seq_Forest, true);
 }
 


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