libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-18 07:53:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCI: Fixed restoring scripts when loading a SCI 1.1 savestate

Browse Source 
svn-id: r40582
This commit is contained in:
Max Horn 2009-05-14 23:39:36 +00:00
parent d2dfa0ac11
commit bd2e21c97a
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
engines/sci/engine/savegame.cpp
View File

@ -580,14 +580,22 @@ static void reconstruct_scripts(EngineState *s, SegManager *self) {
case MEM_OBJ_SCRIPT: {
Script *scr = (Script *)mobj;
// FIXME: Unify this code with script_instantiate_*
load_script(s, i);
scr->locals_block = (scr->locals_segment == 0) ? NULL : (LocalVariables *)(s->seg_manager->_heap[scr->locals_segment]);
scr->export_table = (uint16 *) find_unique_script_block(s, scr->buf, SCI_OBJ_EXPORTS);
scr->synonyms = find_unique_script_block(s, scr->buf, SCI_OBJ_SYNONYMS);
scr->_codeBlocks.clear();
if (!self->isSci1_1)
if (s->seg_manager->isSci1_1) {
scr->export_table = 0;
scr->synonyms = 0;
if (READ_LE_UINT16(scr->buf + 6) > 0) {
scr->export_table = (uint16 *)(scr->buf + 8);
scr->exports_nr = READ_LE_UINT16((byte *)(scr->export_table - 1));
}
} else {
scr->export_table = (uint16 *) find_unique_script_block(s, scr->buf, SCI_OBJ_EXPORTS);
scr->synonyms = find_unique_script_block(s, scr->buf, SCI_OBJ_SYNONYMS);
scr->export_table += 3;
}
scr->_codeBlocks.clear();
for (j = 0; j < scr->_objects.size(); j++) {
byte *data = scr->buf + scr->_objects[j].pos.offset;