From f1cd95e462a8edaacb6e25c119e02b9aa0c657a3 Mon Sep 17 00:00:00 2001 From: Lars Skovlund Date: Tue, 21 Dec 2010 15:34:02 +0000 Subject: [PATCH] Simplify SCI3 relocation code, also making it correct. svn-id: r54985 --- engines/sci/engine/script.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/engines/sci/engine/script.cpp b/engines/sci/engine/script.cpp index 789df63e870..e46c2bd15a7 100644 --- a/engines/sci/engine/script.cpp +++ b/engines/sci/engine/script.cpp @@ -356,14 +356,8 @@ void Script::relocateSci3(reg_t block) { ObjMap::iterator it; for (it = _objects.begin(); it != _objects.end(); ++it) { - unsigned int ofs = it->_value.getPos().offset; - unsigned int size = READ_SCI11ENDIAN_UINT16(_buf + ofs + 2); const byte *seeker = relocStart; - while (READ_SCI11ENDIAN_UINT32(seeker) < ofs + size && - seeker < _buf + _bufSize) { - while (READ_SCI11ENDIAN_UINT32(seeker) < ofs) - seeker += 10; - + while (seeker < _buf + _bufSize) { // TODO: Find out what UINT16 at (seeker + 8) means it->_value.relocateSci3(block.segment, READ_SCI11ENDIAN_UINT32(seeker),