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

[thebluegr at users.sourceforge.net]

Revision: 47729
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47729&view=rev
Author:   thebluegr
Date:     2010-01-30 23:40:29 +0000 (Sat, 30 Jan 2010)

Log Message:
-----------
Fixed loading of saved games

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

Modified: scummvm/trunk/engines/sci/engine/savegame.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/savegame.cpp	2010-01-30 23:03:07 UTC (rev 47728)
+++ scummvm/trunk/engines/sci/engine/savegame.cpp	2010-01-30 23:40:29 UTC (rev 47729)
@@ -951,8 +951,7 @@
 	
 #ifdef ENABLE_SCI32
 	// Copy the Gui32 pointer over to the new EngineState, if it exists
-	if (s->_gui32)
-		retval->_gui32 = s->_gui32;
+	retval->_gui32 = s->_gui32;
 #endif
 
 	// Copy some old data

Modified: scummvm/trunk/engines/sci/engine/vm.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/vm.cpp	2010-01-30 23:03:07 UTC (rev 47728)
+++ scummvm/trunk/engines/sci/engine/vm.cpp	2010-01-30 23:40:29 UTC (rev 47729)
@@ -1043,6 +1043,7 @@
 							// place (i.e. menus have been constructed etc). Therefore, inject a kRestoreGame call
 							// here, instead of the requested function.
 							int saveSlot = g_loadFromLauncher;
+							g_loadFromLauncher = -1;	// invalidate slot, so that we don't load again
 
 							if (saveSlot < 0)
 								error("Requested to load invalid save slot");	// should never happen, really


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