Reset the EngineState pointer in the SciGuiGfx class when loading. Fixes loading with the new GUI

svn-id: r44934

3 files changed, 9 insertions, 1 deletions

diff --git a/engines/sci/gui/gui.cpp b/engines/sci/gui/gui.cpp
index f1dfee166a..71df9eaab3 100644
--- a/engines/sci/gui/gui.cpp
+++ b/engines/sci/gui/gui.cpp
@@ -63,6 +63,11 @@ SciGui::SciGui() {
 SciGui::~SciGui() {
 }
 
+void SciGui::resetEngineState(EngineState *s) {
+	_s = s;
+	_gfx->resetEngineState(s);
+}
+
 void SciGui::init(bool usesOldGfxFunctions) {
 	// Initialize priority bands
 	if (usesOldGfxFunctions) {
diff --git a/engines/sci/gui/gui.h b/engines/sci/gui/gui.h
index df8c3b09db..9aa1ea4308 100644
--- a/engines/sci/gui/gui.h
+++ b/engines/sci/gui/gui.h
@@ -107,7 +107,7 @@ public:
 	virtual bool debugShowMap(int mapNo);
 
 	// FIXME: Don't store EngineState
-	virtual void resetEngineState(EngineState *s) { _s = s; }
+	virtual void resetEngineState(EngineState *s);
 
 private:
 	EngineState *_s;
diff --git a/engines/sci/gui/gui_gfx.h b/engines/sci/gui/gui_gfx.h
index 058b7d4659..019b5d3299 100644
--- a/engines/sci/gui/gui_gfx.h
+++ b/engines/sci/gui/gui_gfx.h
@@ -56,6 +56,9 @@ public:
 
 	void init(void);
 
+	// FIXME: Don't store EngineState
+	void resetEngineState(EngineState *newState) { _s = newState; }
+
 	byte *GetSegment(byte seg);
 	void ResetScreen();