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

SCI: Reverted changes to savegame.cpp made in r54510, as that still occurs

Browse Source 
svn-id: r54511
This commit is contained in:
Filippos Karapetis 2010-11-27 18:23:39 +00:00
parent 3485d433c5
commit 91e42bbcb9
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -194,23 +194,17 @@ void SegManager::saveLoadWithSerializer(Common::Serializer &s) {
for (ObjMap::iterator it = scr->_objects.begin(); it != scr->_objects.end(); ++it) {
reg_t addr = it->_value.getPos();
scr->scriptObjInit(addr, false);
}
Object *obj = scr->scriptObjInit(addr, false);
// In SCI0-SCI1, we need to make two passes, as the objects in the
// script might be in the wrong order (e.g. in the demo of Iceman).
// Refer to bug #3034713
if (getSciVersion() < SCI_VERSION_1_1) {
for (ObjMap::iterator it = scr->_objects.begin(); it != scr->_objects.end(); ++it) {
reg_t addr = it->_value.getPos();
Object *obj = scr->scriptObjInit(addr, false);
if (getSciVersion() < SCI_VERSION_1_1) {
if (!obj->initBaseObject(this, addr, false)) {
error("Failed to locate base object for object at %04X:%04X; skipping", PRINT_REG(addr));
//scr->scriptObjRemove(addr);
// TODO/FIXME: This should not be happening at all. It might indicate a possible issue
// with the garbage collector. It happens for example in LSL5 (German, perhaps English too).
warning("Failed to locate base object for object at %04X:%04X; skipping", PRINT_REG(addr));
scr->_objects.erase(addr.toUint16());
}
}
}
}
}