diff options
author | Max Horn | 2009-09-22 00:35:46 +0000 |
---|---|---|
committer | Max Horn | 2009-09-22 00:35:46 +0000 |
commit | 5fc2428c99b6ea05f45e3c3cd655ce3010ee6aa8 (patch) | |
tree | c9882b6b7ee7ca5692e56f2336a8cfd8d9872ff0 /engines/sci/engine/savegame.cpp | |
parent | 996b9cc74b26764465d3be80527c005bde705029 (diff) | |
download | scummvm-rg350-5fc2428c99b6ea05f45e3c3cd655ce3010ee6aa8.tar.gz scummvm-rg350-5fc2428c99b6ea05f45e3c3cd655ce3010ee6aa8.tar.bz2 scummvm-rg350-5fc2428c99b6ea05f45e3c3cd655ce3010ee6aa8.zip |
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
Diffstat (limited to 'engines/sci/engine/savegame.cpp')
-rw-r--r-- | engines/sci/engine/savegame.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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) { |