diff options
| author | Filippos Karapetis | 2010-06-09 20:12:25 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2010-06-09 20:12:25 +0000 |
| commit | 5d71ae952f47084da758cb5d2df0e53a6c663111 (patch) | |
| tree | 6c892481af3c1fb6d47406b5cb757b0b4e7a01c1 | |
| parent | c486b77bb7d96908d7df1e00b6a61b92fbd176ee (diff) | |
| download | scummvm-rg350-5d71ae952f47084da758cb5d2df0e53a6c663111.tar.gz scummvm-rg350-5d71ae952f47084da758cb5d2df0e53a6c663111.tar.bz2 scummvm-rg350-5d71ae952f47084da758cb5d2df0e53a6c663111.zip | |
The EngineState is no longer recreated when a game is restored, thus we don't need to refresh pointers to it
svn-id: r49549
| -rw-r--r-- | engines/sci/engine/savegame.cpp | 1 | ||||
| -rw-r--r-- | engines/sci/graphics/animate.h | 3 | ||||
| -rw-r--r-- | engines/sci/graphics/gui.cpp | 5 | ||||
| -rw-r--r-- | engines/sci/graphics/gui.h | 3 |
4 files changed, 0 insertions, 12 deletions
diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp index 3ad4ed096e..224115f95f 100644 --- a/engines/sci/engine/savegame.cpp +++ b/engines/sci/engine/savegame.cpp @@ -895,7 +895,6 @@ void gamestate_restore(EngineState *s, Common::SeekableReadStream *fh) { g_sci->_gui32->init(); } else { #endif - g_sci->_gui->resetEngineState(s); g_sci->_gui->init(g_sci->_features->usesOldGfxFunctions()); #ifdef ENABLE_SCI32 } diff --git a/engines/sci/graphics/animate.h b/engines/sci/graphics/animate.h index 706b7182cf..324ca0d700 100644 --- a/engines/sci/graphics/animate.h +++ b/engines/sci/graphics/animate.h @@ -90,9 +90,6 @@ public: GfxAnimate(EngineState *state, GfxCache *cache, GfxPorts *ports, GfxPaint16 *paint16, GfxScreen *screen, GfxPalette *palette, GfxCursor *cursor, GfxTransitions *transitions); virtual ~GfxAnimate(); - // FIXME: Don't store EngineState - void resetEngineState(EngineState *newState) { _s = newState; } - void disposeLastCast(); bool invoke(List *list, int argc, reg_t *argv); void makeSortedList(List *list); diff --git a/engines/sci/graphics/gui.cpp b/engines/sci/graphics/gui.cpp index df9227b87f..63ac6c0a05 100644 --- a/engines/sci/graphics/gui.cpp +++ b/engines/sci/graphics/gui.cpp @@ -86,11 +86,6 @@ SciGui::~SciGui() { delete _coordAdjuster; } -void SciGui::resetEngineState(EngineState *s) { - _s = s; - _animate->resetEngineState(s); -} - void SciGui::init(bool usesOldGfxFunctions) { _ports->init(usesOldGfxFunctions, this, _paint16, _text16); _paint16->init(_animate, _text16); diff --git a/engines/sci/graphics/gui.h b/engines/sci/graphics/gui.h index 7663036117..8e4abdf5b7 100644 --- a/engines/sci/graphics/gui.h +++ b/engines/sci/graphics/gui.h @@ -61,9 +61,6 @@ public: virtual void portraitShow(Common::String resourceName, Common::Point position, uint16 resourceNum, uint16 noun, uint16 verb, uint16 cond, uint16 seq); virtual void portraitUnload(uint16 portraitId); - // FIXME: Don't store EngineState - virtual void resetEngineState(EngineState *s); - protected: GfxCursor *_cursor; EngineState *_s; |