[Scummvm-cvs-logs] CVS: residual engine.cpp,1.27,1.28 smush.cpp,1.35,1.36

[Pawel Kolodziejski]

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

Modified Files:
	engine.cpp smush.cpp 
Log Message:
moved code

Index: engine.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/engine.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- engine.cpp	26 Mar 2004 01:43:53 -0000	1.27
+++ engine.cpp	26 Mar 2004 06:08:00 -0000	1.28
@@ -85,9 +85,6 @@
 		// Run asynchronous tasks
 		lua_runtasks();
 
-		if (_mode == ENGINE_MODE_SMUSH && ! g_smush->isPlaying())
-			_mode = ENGINE_MODE_NORMAL;
-
 		if (_mode == ENGINE_MODE_SMUSH) {
 			if (g_smush->isPlaying()) {
 				movieTime_ = g_smush->getMovieTime();

Index: smush.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/smush.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- smush.cpp	25 Mar 2004 21:14:28 -0000	1.35
+++ smush.cpp	26 Mar 2004 06:08:00 -0000	1.36
@@ -168,6 +168,7 @@
 	_frame++;
 	if (_frame == _nbframes) {
 		_videoFinished = true;
+		Engine::instance()->setMode(ENGINE_MODE_NORMAL);
 	}
 	
 	_movieTime += _speed / 1000;