diff options
| author | Filippos Karapetis | 2010-05-30 20:30:07 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2010-05-30 20:30:07 +0000 |
| commit | 3b96e4833e0035ce5d54efbdd1badeaca858f5ae (patch) | |
| tree | 202749eb2c4e1473bb03d5a5a483007f7978c0f1 | |
| parent | 1fd3877ec7778535174cdfaef50810d619630fbb (diff) | |
| download | scummvm-rg350-3b96e4833e0035ce5d54efbdd1badeaca858f5ae.tar.gz scummvm-rg350-3b96e4833e0035ce5d54efbdd1badeaca858f5ae.tar.bz2 scummvm-rg350-3b96e4833e0035ce5d54efbdd1badeaca858f5ae.zip | |
Cleanup
svn-id: r49334
| -rw-r--r-- | engines/sci/engine/script.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/engines/sci/engine/script.cpp b/engines/sci/engine/script.cpp index aa975cc1d0..fda7d05aa0 100644 --- a/engines/sci/engine/script.cpp +++ b/engines/sci/engine/script.cpp @@ -205,7 +205,7 @@ void SegManager::scriptInitialiseObjectsSci11(SegmentId seg) { const byte *seeker = scr->_heapStart + 4 + READ_SCI11ENDIAN_UINT16(scr->_heapStart + 2) * 2; while (READ_SCI11ENDIAN_UINT16(seeker) == SCRIPT_OBJECT_MAGIC_NUMBER) { - if (READ_SCI11ENDIAN_UINT16(seeker + 14) & SCRIPT_INFO_CLASS) { + if (READ_SCI11ENDIAN_UINT16(seeker + 14) & SCRIPT_INFO_CLASS) { // -info- selector int classpos = seeker - scr->_buf; int species = READ_SCI11ENDIAN_UINT16(seeker + 10); @@ -226,15 +226,6 @@ void SegManager::scriptInitialiseObjectsSci11(SegmentId seg) { reg_t reg = make_reg(seg, seeker - scr->_buf); Object *obj = scr->scriptObjInit(reg); -#if 0 - if (obj->_variables[5].offset != 0xffff) { - obj->_variables[5] = INST_LOOKUP_CLASS(obj->_variables[5].offset); - baseObj = getObject(obj->_variables[5]); - obj->variable_names_nr = baseObj->variables_nr; - obj->_baseObj = baseObj->_baseObj; - } -#endif - // Copy base from species class, as we need its selector IDs obj->setSuperClassSelector( getClassAddress(obj->getSuperClassSelector().offset, SCRIPT_GET_LOCK, NULL_REG)); |