From 5fc2428c99b6ea05f45e3c3cd655ce3010ee6aa8 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Tue, 22 Sep 2009 00:35:46 +0000
Subject: SCI: SegmentObj's now set their type in constructor; replace central
 SegmentObj::createSegmentObj call in SegManager::allocSegment by several
 explicit 'new' statements; some extra cleanup

svn-id: r44242
---
 engines/sci/engine/savegame.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'engines/sci/engine/savegame.cpp')

diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp
index 0c4cdaf9a9..03f249c20a 100644
--- a/engines/sci/engine/savegame.cpp
+++ b/engines/sci/engine/savegame.cpp
@@ -461,10 +461,10 @@ void DynMem::saveLoadWithSerializer(Common::Serializer &s) {
 }
 
 void DataStack::saveLoadWithSerializer(Common::Serializer &s) {
-	s.syncAsUint32LE(nr);
+	s.syncAsUint32LE(_capacity);
 	if (s.isLoading()) {
 		//free(entries);
-		entries = (reg_t *)calloc(nr, sizeof(reg_t));
+		_entries = (reg_t *)calloc(_capacity, sizeof(reg_t));
 	}
 }
 
@@ -561,8 +561,8 @@ static void reconstruct_stack(EngineState *retval) {
 	DataStack *stack = (DataStack *)(retval->segMan->_heap[stack_seg]);
 
 	retval->stack_segment = stack_seg;
-	retval->stack_base = stack->entries;
-	retval->stack_top = retval->stack_base + VM_STACK_SIZE;
+	retval->stack_base = stack->_entries;
+	retval->stack_top = stack->_entries + stack->_capacity;
 }
 
 static void load_script(EngineState *s, Script *scr) {
-- 
cgit v1.2.3