aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorFilippos Karapetis2009-11-03 11:32:23 +0000
committerFilippos Karapetis2009-11-03 11:32:23 +0000
commitff9c4908a7e5f500398a911f8d3d74e7d4278cc8 (patch)
tree9e4e4e483d5f11404671e0b3ba3b8aa217551797 /engines
parentf0c628cc3c4cf227e8b5df7bc8a052b567a5bdde (diff)
downloadscummvm-rg350-ff9c4908a7e5f500398a911f8d3d74e7d4278cc8.tar.gz
scummvm-rg350-ff9c4908a7e5f500398a911f8d3d74e7d4278cc8.tar.bz2
scummvm-rg350-ff9c4908a7e5f500398a911f8d3d74e7d4278cc8.zip
Fixed a crash when loading in the old GUI
svn-id: r45628
Diffstat (limited to 'engines')
-rw-r--r--engines/sci/gui32/gui32.cpp5
-rw-r--r--engines/sci/gui32/gui32.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/engines/sci/gui32/gui32.cpp b/engines/sci/gui32/gui32.cpp
index 76ce5827c0..3a51f92aa9 100644
--- a/engines/sci/gui32/gui32.cpp
+++ b/engines/sci/gui32/gui32.cpp
@@ -394,6 +394,11 @@ void SciGui32::init(bool oldGfxFunctions) {
port_origin_y = 0;
}
+void SciGui32::resetEngineState(EngineState *s) {
+ _s = s;
+ _gfx->resetEngineState(s);
+}
+
void SciGui32::wait(int16 ticks) {
uint32 time;
diff --git a/engines/sci/gui32/gui32.h b/engines/sci/gui32/gui32.h
index 3c70a0bae0..6256ee15ff 100644
--- a/engines/sci/gui32/gui32.h
+++ b/engines/sci/gui32/gui32.h
@@ -113,7 +113,7 @@ public:
bool debugShowMap(int mapNo);
// FIXME: Don't store EngineState
- virtual void resetEngineState(EngineState *newState) { _s = newState; }
+ virtual void resetEngineState(EngineState *newState);
private:
bool _usesOldGfxFunctions;