[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.170,2.171 script_v6.cpp,1.343,1.344 scumm.cpp,1.63,1.64 scumm.h,1.417,1.418

[Max Horn]

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

Modified Files:
	intern.h script_v6.cpp scumm.cpp scumm.h 
Log Message:
Renamed/documented some odd smush/insane vars

Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.170
retrieving revision 2.171
diff -u -d -r2.170 -r2.171
--- intern.h	27 Jun 2004 13:33:02 -0000	2.170
+++ intern.h	27 Jun 2004 21:06:02 -0000	2.171
@@ -329,6 +329,9 @@
 	// HE v7.0+ games
 	Win32ResExtractor *_Win32ResExtractor;
 
+
+	int _smushFrameRate;
+
 public:
 	ScummEngine_v6(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs);
 

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.343
retrieving revision 1.344
diff -u -d -r1.343 -r1.344
--- script_v6.cpp	24 Jun 2004 20:20:35 -0000	1.343
+++ script_v6.cpp	27 Jun 2004 21:06:03 -0000	1.344
@@ -2519,7 +2519,7 @@
 						? 232 : 233;
 
 					_insaneRunning = true;
-		    			_insane->setSmushParams(speed);
+					_insane->setSmushParams(speed);
 					_insane->runScene(insaneVarNum);
 					_insaneRunning = false;
 				}

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- scumm.cpp	27 Jun 2004 15:22:31 -0000	1.63
+++ scumm.cpp	27 Jun 2004 21:06:03 -0000	1.64
@@ -363,8 +363,7 @@
 	_sound = NULL;
 	memset(&res, 0, sizeof(res));
 	memset(&vm, 0, sizeof(vm));
-	_smushFrameRate = 0;
-	_videoFinished = false;
+	_smushVideoShouldFinish = false;
 	_smushPaused = false;
 	_insaneRunning = false;
 	_quit = false;
@@ -917,6 +916,8 @@
 	} else {
 		_Win32ResExtractor = 0;
 	}
+
+	_smushFrameRate = 0;
 }
 
 void ScummEngine::go() {
@@ -1933,9 +1934,9 @@
 			if (_gameId == GID_FT)
 				_insane->escapeKeyHandler();
 			else
-				_videoFinished = true;
+				_smushVideoShouldFinish = true;
 		}
-		if (!smushMode || _videoFinished)
+		if (!smushMode || _smushVideoShouldFinish)
 			abortCutscene();
 		if (_version <= 2) {
 			// Ensure that the input script also sees the key press.

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.417
retrieving revision 1.418
diff -u -d -r1.417 -r1.418
--- scumm.h	27 Jun 2004 15:41:01 -0000	1.417
+++ scumm.h	27 Jun 2004 21:06:03 -0000	1.418
@@ -394,12 +394,20 @@
 	void animateCursor();
 	void updatePalette();
 
-	/* _insane vars */
-	int _smushFrameRate;
-	bool _videoFinished;
+	/**
+	 * Flag which signals that the SMUSH video playback should end now
+	 * (e.g. because it was aborted by the user or it's simply finished).
+	 */
+	bool _smushVideoShouldFinish;
+	/** This flag is a hack to allow the pause dialog to pause SMUSH playback, too. */
 	bool _smushPaused;
+	/** This flag tells IMuseDigital that INSANE is running. */
 	bool _insaneRunning;
 
+protected:
+	Insane *_insane;
+
+public:
 	void pauseGame();
 	void restart();
 	void shutDown();
@@ -1036,8 +1044,6 @@
 	bool _demoMode;
 	bool _confirmExit;
 
-	Insane *_insane;
-
 public:
 	uint16 _extraBoxFlags[65];