From 0ed87062ed776e8d182eac16157b2c7b48796843 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sat, 3 Oct 2009 23:56:49 +0000
Subject: SCI: Add hack to gui to fix loading

svn-id: r44581
---
 engines/sci/engine/savegame.cpp | 3 +++
 engines/sci/gui/gui.h           | 3 +++
 engines/sci/gui32/gui32.h       | 3 +++
 3 files changed, 9 insertions(+)

(limited to 'engines')

diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp
index 8747ba31b8..dd2daaeb75 100644
--- a/engines/sci/engine/savegame.cpp
+++ b/engines/sci/engine/savegame.cpp
@@ -796,6 +796,9 @@ EngineState *gamestate_restore(EngineState *s, Common::SeekableReadStream *fh) {
 	// Message state:
 	retval->_msgState = s->_msgState;
 
+	retval->gui = s->gui;
+	retval->gui->resetEngineState(retval);
+
 	return retval;
 }
 
diff --git a/engines/sci/gui/gui.h b/engines/sci/gui/gui.h
index 092121de62..713db08bd5 100644
--- a/engines/sci/gui/gui.h
+++ b/engines/sci/gui/gui.h
@@ -37,6 +37,9 @@ public:
 	SciGUI();
 	virtual ~SciGUI();
 
+	// FIXME: Don't store EngineState
+	virtual void resetEngineState(EngineState *s) { _s = s; }
+
 	virtual void init(bool oldGfxFunctions);
 
 	virtual int16 getTimeTicks();
diff --git a/engines/sci/gui32/gui32.h b/engines/sci/gui32/gui32.h
index d986883849..5f4fe360af 100644
--- a/engines/sci/gui32/gui32.h
+++ b/engines/sci/gui32/gui32.h
@@ -30,6 +30,9 @@ public:
 	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();
-- 
cgit v1.2.3