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

[thebluegr at users.sourceforge.net]

Revision: 45628
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45628&view=rev
Author:   thebluegr
Date:     2009-11-03 11:32:23 +0000 (Tue, 03 Nov 2009)

Log Message:
-----------
Fixed a crash when loading in the old GUI

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

Modified: scummvm/trunk/engines/sci/gui32/gui32.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui32/gui32.cpp	2009-11-03 09:54:09 UTC (rev 45627)
+++ scummvm/trunk/engines/sci/gui32/gui32.cpp	2009-11-03 11:32:23 UTC (rev 45628)
@@ -394,6 +394,11 @@
 	port_origin_y = 0;
 }
 
+void SciGui32::resetEngineState(EngineState *s) {
+	_s = s;
+	_gfx->resetEngineState(s);
+}
+
 void SciGui32::wait(int16 ticks) {
 	uint32 time;
 

Modified: scummvm/trunk/engines/sci/gui32/gui32.h
===================================================================
--- scummvm/trunk/engines/sci/gui32/gui32.h	2009-11-03 09:54:09 UTC (rev 45627)
+++ scummvm/trunk/engines/sci/gui32/gui32.h	2009-11-03 11:32:23 UTC (rev 45628)
@@ -113,7 +113,7 @@
 	bool debugShowMap(int mapNo);
 
 	// FIXME: Don't store EngineState
-	virtual void resetEngineState(EngineState *newState) { _s = newState; }
+	virtual void resetEngineState(EngineState *newState);
 
 private:
 	bool _usesOldGfxFunctions;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.