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

[thebluegr at users.sourceforge.net]

Revision: 49689
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49689&view=rev
Author:   thebluegr
Date:     2010-06-15 09:11:26 +0000 (Tue, 15 Jun 2010)

Log Message:
-----------
Properly reconstruct the running stack when restoring (a regression from commits #49376 and #49525), some formatting

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/savegame.cpp
    scummvm/trunk/engines/sci/engine/segment.h
    scummvm/trunk/engines/sci/engine/state.cpp

Modified: scummvm/trunk/engines/sci/engine/savegame.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/savegame.cpp	2010-06-15 08:39:03 UTC (rev 49688)
+++ scummvm/trunk/engines/sci/engine/savegame.cpp	2010-06-15 09:11:26 UTC (rev 49689)
@@ -994,6 +994,7 @@
 #endif
 
 	s->abortScriptProcessing = kAbortLoadGame;
+	s->shrinkStackToBase();
 }
 
 bool get_savegame_metadata(Common::SeekableReadStream *stream, SavegameMetadata *meta) {

Modified: scummvm/trunk/engines/sci/engine/segment.h
===================================================================
--- scummvm/trunk/engines/sci/engine/segment.h	2010-06-15 08:39:03 UTC (rev 49688)
+++ scummvm/trunk/engines/sci/engine/segment.h	2010-06-15 09:11:26 UTC (rev 49689)
@@ -802,7 +802,7 @@
 	byte getType() const { return _type; }
 	uint32 getSize() const { return _size; }
 	T *getRawData() { return _data; }
-	const T *getRawData()const { return _data; }
+	const T *getRawData() const { return _data; }
 
 protected:
 	int8 _type;

Modified: scummvm/trunk/engines/sci/engine/state.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/state.cpp	2010-06-15 08:39:03 UTC (rev 49688)
+++ scummvm/trunk/engines/sci/engine/state.cpp	2010-06-15 09:11:26 UTC (rev 49689)
@@ -90,13 +90,13 @@
 
 		_fileHandles.resize(5);
 
-		stack_base = 0;
-		stack_top = 0;
 		abortScriptProcessing = kAbortNone;
 	}
 
 	executionStackBase = 0;
 	_executionStackPosChanged = false;
+	stack_base = 0;
+	stack_top = 0;
 
 	restAdjust = 0;
 


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