aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/engine/segment.cpp
diff options
context:
space:
mode:
authorFilippos Karapetis2010-06-22 15:03:19 +0000
committerFilippos Karapetis2010-06-22 15:03:19 +0000
commitc28fa2cf196eec983ad2b33b4f5ca9e607a9652d (patch)
treeb32c785c5292caed75e7207304731c3e8b904fff /engines/sci/engine/segment.cpp
parent5855cd7127c9c7b40a67dd9d8aecbd065fc231b9 (diff)
downloadscummvm-rg350-c28fa2cf196eec983ad2b33b4f5ca9e607a9652d.tar.gz
scummvm-rg350-c28fa2cf196eec983ad2b33b4f5ca9e607a9652d.tar.bz2
scummvm-rg350-c28fa2cf196eec983ad2b33b4f5ca9e607a9652d.zip
Reverted the code which handles objects without a base object when loading, for now. This possibly indicates an issue related to the garbage collector
svn-id: r50142
Diffstat (limited to 'engines/sci/engine/segment.cpp')
-rw-r--r--engines/sci/engine/segment.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/engines/sci/engine/segment.cpp b/engines/sci/engine/segment.cpp
index c2f72ecdbd..98f03ff18a 100644
--- a/engines/sci/engine/segment.cpp
+++ b/engines/sci/engine/segment.cpp
@@ -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) {