[Scummvm-cvs-logs] CVS: scummvm/scumm/smush scumm_renderer.cpp,1.15,1.16

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm/smush
In directory usw-pr-cvs1:/tmp/cvs-serv7248/scumm/smush

Modified Files:
	scumm_renderer.cpp 
Log Message:
allow user to load savegames while Smush movies are playing; cleanup

Index: scumm_renderer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/scumm_renderer.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- scumm_renderer.cpp	6 Oct 2002 08:45:16 -0000	1.15
+++ scumm_renderer.cpp	8 Oct 2002 00:29:32 -0000	1.16
@@ -27,7 +27,8 @@
 #include "sound/mixer.h"
 #include "scumm/scumm.h"
 #include "scumm/sound.h"
-#include "scumm/actor.h"
+#include "scumm/actor.h"
+
 
 class ScummMixer : public Mixer {
 private:
@@ -216,7 +217,7 @@
 }
 
 ScummRenderer::~ScummRenderer() {
-	_scumm->_insaneState = 0;
+	_scumm->_insaneState = false;
 	_scumm->exitCutscene();
 	if(_smixer) {
 		_scumm->_timer->releaseProcedure(&smush_handler);
@@ -240,8 +241,8 @@
 
 bool ScummRenderer::startDecode(const char * fname, int32 version, int32 nbframes) {
 	_scumm->_sound->pauseBundleMusic(true);
-	_scumm->videoFinished = 0;
-	_scumm->_insaneState = 1;
+	_scumm->_videoFinished = false;
+	_scumm->_insaneState = true;
 	return true;
 }
 
@@ -273,8 +274,9 @@
 }
 
 bool ScummRenderer::prematureClose() { 
-	
-	return _scumm->videoFinished ? true : false;
+	
+	return _scumm->_videoFinished || _scumm->_saveLoadFlag;
+
 }
 
 bool ScummRenderer::update() {