thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reverted the code which handles objects without a base object when loading, for now. This possibly indicates an issue related to the garbage collector

Browse source 
svn-id: r50142
This commit is contained in:
Filippos Karapetis 2010-06-22 15:03:19 +00:00
parent 5855cd7127
commit c28fa2cf19
3 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/sci/engine/segment.cpp
View file

@ -268,14 +268,12 @@ Object *Script::scriptObjInit(reg_t obj_pos, bool fullObjectInit) {
return obj;
}
#if 0
void Script::scriptObjRemove(reg_t obj_pos) {
if (getSciVersion() < SCI_VERSION_1_1)
obj_pos.offset += 8;
_objects.erase(obj_pos.toUint16());
}
#endif
// This helper function is used by Script::relocateLocal and Object::relocate
static bool relocateBlock(Common::Array<reg_t> &block, int block_location, SegmentId segment, int location, size_t scriptSize) {