[Scummvm-cvs-logs] SF.net SVN: scummvm: [22334] scummvm/trunk/engines/simon/simon.cpp

[kirben at users.sourceforge.net]

Revision: 22334
Author:   kirben
Date:     2006-05-04 04:52:56 -0700 (Thu, 04 May 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22334&view=rev

Log Message:
-----------
Allow skipping speech in Simon1

Modified Paths:
--------------
    scummvm/trunk/engines/simon/simon.cpp
Modified: scummvm/trunk/engines/simon/simon.cpp
===================================================================
--- scummvm/trunk/engines/simon/simon.cpp	2006-05-04 11:19:48 UTC (rev 22333)
+++ scummvm/trunk/engines/simon/simon.cpp	2006-05-04 11:52:56 UTC (rev 22334)
@@ -1559,8 +1559,8 @@
 	_exitCutscene = false;
 	_rightButtonDown = false;
 	while (_vgaWaitFor != 0) {
-		if (_rightButtonDown && (getGameType() == GType_SIMON2 || getGameType() == GType_FF)) {
-			if (_vgaWaitFor == 200 && (getGameType() == GType_FF || !getBitFlag(14))) {
+		if (_rightButtonDown) {
+			if (_vgaWaitFor == 200 && !getBitFlag(14)) {
 				skipSpeech();
 				break;
 			}
@@ -1591,11 +1591,16 @@
 			loadSprite(4, 2, 13, 0, 0, 0);
 			waitForSync(213);
 			stopAnimateSimon2(2, 1);
-		} else {
+		} else if (getGameType() == GType_SIMON2) {
 			_variableArray[100] = 5;
 			loadSprite(4, 1, 30, 0, 0, 0);
 			waitForSync(130);
 			stopAnimateSimon2(2, 1);
+		} else {
+			_variableArray[100] = 15;
+			loadSprite(4, 1, 130, 0, 0, 0);
+			waitForSync(130);
+			stopAnimateSimon1(1);
 		}
 	}
 }
@@ -2021,10 +2026,7 @@
 			case OSystem::EVENT_RBUTTONDOWN:
 				if (getGameType() == GType_FF)
 					setBitFlag(92, false);
-				if (getGameType() == GType_SIMON2 || getGameType() == GType_FF)
-					_rightButtonDown++;
-				else
-					_exitCutscene = true;
+				_rightButtonDown++;
 				break;
 			case OSystem::EVENT_QUIT:
 				shutdown();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.