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

[thebluegr at users.sourceforge.net]

Revision: 44771
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44771&view=rev
Author:   thebluegr
Date:     2009-10-08 07:57:26 +0000 (Thu, 08 Oct 2009)

Log Message:
-----------
Restore the engine state stored within SciGui during loading once more, since it gets replaced during loading. Fixes loading (a regression from #44730)

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/savegame.cpp
    scummvm/trunk/engines/sci/gui/gui.h
    scummvm/trunk/engines/sci/gui32/gui32.h

Modified: scummvm/trunk/engines/sci/engine/savegame.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/savegame.cpp	2009-10-08 07:25:18 UTC (rev 44770)
+++ scummvm/trunk/engines/sci/engine/savegame.cpp	2009-10-08 07:57:26 UTC (rev 44771)
@@ -794,6 +794,8 @@
 	// Message state:
 	retval->_msgState = s->_msgState;
 
+	retval->_gui->resetEngineState(retval);
+
 	return retval;
 }
 

Modified: scummvm/trunk/engines/sci/gui/gui.h
===================================================================
--- scummvm/trunk/engines/sci/gui/gui.h	2009-10-08 07:25:18 UTC (rev 44770)
+++ scummvm/trunk/engines/sci/gui/gui.h	2009-10-08 07:57:26 UTC (rev 44771)
@@ -94,6 +94,9 @@
 	virtual bool debugUndither(bool flag);
 	virtual bool debugShowMap(int mapNo);
 
+	// FIXME: Don't store EngineState
+	virtual void resetEngineState(EngineState *s) { _s = s; }
+
 private:
 	EngineState *_s;
 	SciGuiScreen *_screen;

Modified: scummvm/trunk/engines/sci/gui32/gui32.h
===================================================================
--- scummvm/trunk/engines/sci/gui32/gui32.h	2009-10-08 07:25:18 UTC (rev 44770)
+++ scummvm/trunk/engines/sci/gui32/gui32.h	2009-10-08 07:57:26 UTC (rev 44771)
@@ -86,6 +86,9 @@
 	bool debugUndither(bool flag);
 	bool debugShowMap(int mapNo);
 
+	// FIXME: Don't store EngineState
+	virtual void resetEngineState(EngineState *newState) { s = newState; }
+
 private:
 	EngineState *s;
 	bool _usesOldGfxFunctions;


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