[Scummvm-cvs-logs] SF.net SVN: scummvm:[41346] scummvm/trunk/engines/sci/engine/vm.cpp

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Sun Jun 7 19:18:14 CEST 2009


Revision: 41346
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41346&view=rev
Author:   fingolfin
Date:     2009-06-07 17:18:11 +0000 (Sun, 07 Jun 2009)

Log Message:
-----------
SCI: Fixed the broken SciEngine::pauseEngineIntern code by ensuring that SciEngine::_gamestate is updated whenever the EngineState gets changed (due to loading a savestate)

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/vm.cpp

Modified: scummvm/trunk/engines/sci/engine/vm.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/vm.cpp	2009-06-07 17:07:25 UTC (rev 41345)
+++ scummvm/trunk/engines/sci/engine/vm.cpp	2009-06-07 17:18:11 UTC (rev 41346)
@@ -1947,7 +1947,7 @@
 
 EngineState *g_EngineState = 0;
 
-static EngineState *_game_run(EngineState *s, int restoring) {
+static EngineState *_game_run(EngineState *&s, int restoring) {
 	EngineState *successor = NULL;
 	int game_is_finished = 0;
 	g_EngineState = s;
@@ -2014,7 +2014,7 @@
 		return 1;
 	}
 	// and ENGAGE!
-	*_s = s = _game_run(s, 0);
+	_game_run(*_s, 0);
 
 	sciprintf(" Game::play() finished.\n");
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list