[Scummvm-cvs-logs] SF.net SVN: scummvm:[49549] scummvm/trunk/engines/sci
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Wed Jun 9 22:12:26 CEST 2010
Revision: 49549
http://scummvm.svn.sourceforge.net/scummvm/?rev=49549&view=rev
Author: thebluegr
Date: 2010-06-09 20:12:25 +0000 (Wed, 09 Jun 2010)
Log Message:
-----------
The EngineState is no longer recreated when a game is restored, thus we don't need to refresh pointers to it
Modified Paths:
--------------
scummvm/trunk/engines/sci/engine/savegame.cpp
scummvm/trunk/engines/sci/graphics/animate.h
scummvm/trunk/engines/sci/graphics/gui.cpp
scummvm/trunk/engines/sci/graphics/gui.h
Modified: scummvm/trunk/engines/sci/engine/savegame.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/savegame.cpp 2010-06-09 20:09:57 UTC (rev 49548)
+++ scummvm/trunk/engines/sci/engine/savegame.cpp 2010-06-09 20:12:25 UTC (rev 49549)
@@ -895,7 +895,6 @@
g_sci->_gui32->init();
} else {
#endif
- g_sci->_gui->resetEngineState(s);
g_sci->_gui->init(g_sci->_features->usesOldGfxFunctions());
#ifdef ENABLE_SCI32
}
Modified: scummvm/trunk/engines/sci/graphics/animate.h
===================================================================
--- scummvm/trunk/engines/sci/graphics/animate.h 2010-06-09 20:09:57 UTC (rev 49548)
+++ scummvm/trunk/engines/sci/graphics/animate.h 2010-06-09 20:12:25 UTC (rev 49549)
@@ -90,9 +90,6 @@
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);
Modified: scummvm/trunk/engines/sci/graphics/gui.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/gui.cpp 2010-06-09 20:09:57 UTC (rev 49548)
+++ scummvm/trunk/engines/sci/graphics/gui.cpp 2010-06-09 20:12:25 UTC (rev 49549)
@@ -86,11 +86,6 @@
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);
Modified: scummvm/trunk/engines/sci/graphics/gui.h
===================================================================
--- scummvm/trunk/engines/sci/graphics/gui.h 2010-06-09 20:09:57 UTC (rev 49548)
+++ scummvm/trunk/engines/sci/graphics/gui.h 2010-06-09 20:12:25 UTC (rev 49549)
@@ -61,9 +61,6 @@
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;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list