[Scummvm-cvs-logs] SF.net SVN: scummvm:[45023] scummvm/trunk/engines/sci/gui

m_kiewitz at users.sourceforge.net m_kiewitz at users.sourceforge.net
Tue Oct 13 17:47:05 CEST 2009


Revision: 45023
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45023&view=rev
Author:   m_kiewitz
Date:     2009-10-13 15:47:05 +0000 (Tue, 13 Oct 2009)

Log Message:
-----------
SCI/newgui: implemented resetEngineState() in SciGuiAnimate

Modified Paths:
--------------
    scummvm/trunk/engines/sci/gui/gui.cpp
    scummvm/trunk/engines/sci/gui/gui_animate.h

Modified: scummvm/trunk/engines/sci/gui/gui.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui.cpp	2009-10-13 15:43:58 UTC (rev 45022)
+++ scummvm/trunk/engines/sci/gui/gui.cpp	2009-10-13 15:47:05 UTC (rev 45023)
@@ -68,6 +68,7 @@
 void SciGui::resetEngineState(EngineState *s) {
 	_s = s;
 	_gfx->resetEngineState(s);
+	_animate->resetEngineState(s);
 }
 
 void SciGui::init(bool usesOldGfxFunctions) {

Modified: scummvm/trunk/engines/sci/gui/gui_animate.h
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_animate.h	2009-10-13 15:43:58 UTC (rev 45022)
+++ scummvm/trunk/engines/sci/gui/gui_animate.h	2009-10-13 15:47:05 UTC (rev 45023)
@@ -53,6 +53,9 @@
 	SciGuiAnimate(EngineState *state, SciGuiGfx *gfx, SciGuiScreen *screen, SciGuiPalette *palette);
 	~SciGuiAnimate();
 
+	// FIXME: Don't store EngineState
+	void resetEngineState(EngineState *newState) { _s = newState; }
+
 	void disposeLastCast();
 	void invoke(List *list, int argc, reg_t *argv);
 	void makeSortedList(List *list);


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