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

athrxx at users.sourceforge.net athrxx at users.sourceforge.net
Thu Mar 20 21:36:36 CET 2008


Revision: 31207
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31207&view=rev
Author:   athrxx
Date:     2008-03-20 13:36:36 -0700 (Thu, 20 Mar 2008)

Log Message:
-----------
- fix skip flags for non-playable demo

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/sequences_v2.cpp

Modified: scummvm/trunk/engines/kyra/sequences_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sequences_v2.cpp	2008-03-20 12:29:35 UTC (rev 31206)
+++ scummvm/trunk/engines/kyra/sequences_v2.cpp	2008-03-20 20:36:36 UTC (rev 31207)
@@ -39,7 +39,7 @@
 	debugC(9, kDebugLevelMain, "KyraEngine_v2::seq_playSequences(%i, %i)", startSeq, endSeq);
 	seq_init();
 
-	bool allowSkip = (startSeq == kSequenceTitle) ? false : true;
+	bool allowSkip = (!(_flags.isDemo && !_flags.isTalkie) && (startSeq == kSequenceTitle)) ? false : true;
 
 	if (endSeq == -1)
 		endSeq = startSeq;
@@ -81,7 +81,7 @@
 		_seqFrameCounter = 0;
 		_seqStartTime = _system->getMillis();
 
-		allowSkip = (seqNum == 2) ? false : true;
+		allowSkip = (!(_flags.isDemo && !_flags.isTalkie) && (seqNum == kSequenceTitle)) ? false : true;
 
 		if (_sequences[seqNum].flags & 2) {
 			_screen->loadBitmap(_sequences[seqNum].cpsFile, 2, 2, _screen->getPalette(0));
@@ -280,15 +280,20 @@
 		seq_sequenceCommand(_sequences[seqNum].finalCommand);
 		seq_resetAllTextEntries();
 
-		if (_flags.isDemo && seqNum == kSequenceDemoFisher) {
-			_abortIntroFlag = false;
-			resetSkipFlag();
-			seqNum = kSequenceDemoVirgin;
-		} else if ((seqNum != kSequenceTitle && seqNum < kSequenceZanfaun &&
+
+		if (_flags.isDemo && !_flags.isTalkie) {
+			if (seqNum == kSequenceDemoFisher) {
+				_abortIntroFlag = false;
+				resetSkipFlag();
+				seqNum = kSequenceDemoVirgin;
+			}
+		} else {
+			if ((seqNum != kSequenceTitle && seqNum < kSequenceZanfaun &&
 			(_abortIntroFlag || skipFlag())) || seqNum == kSequenceZanfaun) {
-			_abortIntroFlag = false;
-			resetSkipFlag();
-			seqNum = kSequenceWestwood;
+				_abortIntroFlag = false;
+				resetSkipFlag();
+				seqNum = kSequenceWestwood;
+			}
 		}
 
 		if (_menuChoice) {


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