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

[thebluegr at users.sourceforge.net]

Revision: 41102
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41102&view=rev
Author:   thebluegr
Date:     2009-06-01 15:34:33 +0000 (Mon, 01 Jun 2009)

Log Message:
-----------
Some fixes for saving/loading (still broken)

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/game.cpp
    scummvm/trunk/engines/sci/engine/savegame.cpp

Modified: scummvm/trunk/engines/sci/engine/game.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/game.cpp	2009-06-01 14:12:43 UTC (rev 41101)
+++ scummvm/trunk/engines/sci/engine/game.cpp	2009-06-01 15:34:33 UTC (rev 41102)
@@ -424,7 +424,9 @@
 	s->_kfuncTable.clear();
 
 	delete s->_vocabulary;
+	s->_vocabulary = 0;
 	delete s->_kernel;
+	s->_kernel = 0;
 }
 
 void script_free_breakpoints(EngineState *s) {

Modified: scummvm/trunk/engines/sci/engine/savegame.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/savegame.cpp	2009-06-01 14:12:43 UTC (rev 41101)
+++ scummvm/trunk/engines/sci/engine/savegame.cpp	2009-06-01 15:34:33 UTC (rev 41102)
@@ -780,6 +780,7 @@
 	retval->animation_delay = s->animation_delay;
 	retval->animation_granularity = s->animation_granularity;
 	retval->gfx_state = s->gfx_state;
+	retval->old_screen = 0;
 
 	retval->resmgr = s->resmgr;
 
@@ -832,8 +833,8 @@
 	retval->parser_base = make_reg(s->sys_strings_segment, SYS_STRING_PARSER_BASE);
 
 	// static VM/Kernel information:
+	assert(0 == retval->_kernel);
 	retval->_kernel = s->_kernel;
-	assert(0 == retval->_kernel);
 //	s->_kernel = 0;	// FIXME: We should set s->_kernel to 0 here,
 // else it could be freed when the old EngineState is freed. Luckily, this freeing currently
 // never happens, so we don't need to. 


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