[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.h,1.336,1.337 scummvm.cpp,2.516,2.517

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv2427

Modified Files:
	scumm.h scummvm.cpp 
Log Message:
Fix pause mode during video/smush playback

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.336
retrieving revision 1.337
diff -u -d -r1.336 -r1.337
--- scumm.h	24 Dec 2003 17:42:19 -0000	1.336
+++ scumm.h	25 Dec 2003 02:55:00 -0000	1.337
@@ -338,6 +338,7 @@
 	int _smushFrameRate;
 	bool _insaneState;
 	bool _videoFinished;
+	bool _smushPaused;
 	
 	void pauseGame();
 	void restart();

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.516
retrieving revision 2.517
diff -u -d -r2.516 -r2.517
--- scummvm.cpp	24 Dec 2003 17:42:19 -0000	2.516
+++ scummvm.cpp	25 Dec 2003 02:55:00 -0000	2.517
@@ -315,6 +315,7 @@
 	_smushFrameRate = 0;
 	_insaneState = false;
 	_videoFinished = false;
+	_smushPaused = false;
 	_quit = false;
 	_pauseDialog = NULL;
 	_optionsDialog = NULL;
@@ -2533,9 +2534,11 @@
 #pragma mark -
 
 int ScummEngine::runDialog(Dialog &dialog) {
-	// Pause sound put
+	// Pause sound & video
 	bool old_soundsPaused = _sound->_soundsPaused;
 	_sound->pauseSounds(true);
+	bool oldSmushPaused = _smushPaused;
+	_smushPaused = true;
 
 	// Open & run the dialog
 	int result = dialog.runModal();
@@ -2543,8 +2546,9 @@
 	// Restore old cursor
 	updateCursor();
 
-	// Resume sound output
+	// Resume sound & video
 	_sound->pauseSounds(old_soundsPaused);
+	_smushPaused = oldSmushPaused;
 	
 	// Return the result
 	return result;