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

[wjpalenstijn at users.sourceforge.net]

Revision: 44581
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44581&view=rev
Author:   wjpalenstijn
Date:     2009-10-03 23:56:49 +0000 (Sat, 03 Oct 2009)

Log Message:
-----------
SCI: Add hack to gui to fix loading

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-03 23:16:32 UTC (rev 44580)
+++ scummvm/trunk/engines/sci/engine/savegame.cpp	2009-10-03 23:56:49 UTC (rev 44581)
@@ -796,6 +796,9 @@
 	// Message state:
 	retval->_msgState = s->_msgState;
 
+	retval->gui = s->gui;
+	retval->gui->resetEngineState(retval);
+
 	return retval;
 }
 

Modified: scummvm/trunk/engines/sci/gui/gui.h
===================================================================
--- scummvm/trunk/engines/sci/gui/gui.h	2009-10-03 23:16:32 UTC (rev 44580)
+++ scummvm/trunk/engines/sci/gui/gui.h	2009-10-03 23:56:49 UTC (rev 44581)
@@ -37,6 +37,9 @@
 	SciGUI();
 	virtual ~SciGUI();
 
+	// FIXME: Don't store EngineState
+	virtual void resetEngineState(EngineState *s) { _s = s; }
+
 	virtual void init(bool oldGfxFunctions);
 
 	virtual int16 getTimeTicks();

Modified: scummvm/trunk/engines/sci/gui32/gui32.h
===================================================================
--- scummvm/trunk/engines/sci/gui32/gui32.h	2009-10-03 23:16:32 UTC (rev 44580)
+++ scummvm/trunk/engines/sci/gui32/gui32.h	2009-10-03 23:56:49 UTC (rev 44581)
@@ -30,6 +30,9 @@
 	SciGUI32(OSystem *system, EngineState *s);
 	~SciGUI32();
 
+	// FIXME: Don't store EngineState
+	virtual void resetEngineState(EngineState *s) { this->s = s; }
+
 	void init(bool oldGfxFunctions);
 
 	int16 getTimeTicks();


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