[Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.335,1.336 scumm.cpp,1.40,1.41 scumm.h,1.402,1.403

Pawel Kolodziejski aquadran at users.sourceforge.net
Sun Jun 20 14:02:06 CEST 2004


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9314/scummvm/scumm

Modified Files:
	script_v6.cpp scumm.cpp scumm.h 
Log Message:
changed check to _insaneRunning

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.335
retrieving revision 1.336
diff -u -d -r1.335 -r1.336
--- script_v6.cpp	20 Jun 2004 14:47:14 -0000	1.335
+++ script_v6.cpp	20 Jun 2004 21:01:31 -0000	1.336
@@ -2499,8 +2499,10 @@
 					const int insaneVarNum = ((_features & GF_DEMO) && (_features & GF_PC)) 
 						? 232 : 233;
 
-					_insane->setSmushParams(speed);
+					_insaneRunning = true;
+		    			_insane->setSmushParams(speed);
 					_insane->runScene(insaneVarNum);
+					_insaneRunning = false;
 				}
 			}
 			break;

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- scumm.cpp	19 Jun 2004 16:00:10 -0000	1.40
+++ scumm.cpp	20 Jun 2004 21:01:31 -0000	1.41
@@ -352,6 +352,7 @@
 	_smushFrameRate = 0;
 	_videoFinished = false;
 	_smushPaused = false;
+	_insaneRunning = false;
 	_quit = false;
 	_pauseDialog = NULL;
 	_optionsDialog = NULL;

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.402
retrieving revision 1.403
diff -u -d -r1.402 -r1.403
--- scumm.h	7 Jun 2004 00:26:08 -0000	1.402
+++ scumm.h	20 Jun 2004 21:01:31 -0000	1.403
@@ -394,7 +394,8 @@
 	int _smushFrameRate;
 	bool _videoFinished;
 	bool _smushPaused;
-	
+	bool _insaneRunning;
+
 	void pauseGame();
 	void restart();
 	void shutDown();





More information about the Scummvm-git-logs mailing list