diff options
| author | Lars Skovlund | 2010-12-21 15:34:02 +0000 |
|---|---|---|
| committer | Lars Skovlund | 2010-12-21 15:34:02 +0000 |
| commit | f1cd95e462a8edaacb6e25c119e02b9aa0c657a3 (patch) | |
| tree | 275059818d5666c8b155bc0b4afdc1c356c4a85a | |
| parent | 3a14a7760e0fb2b59e9666cb14d227b276e29f6d (diff) | |
| download | scummvm-rg350-f1cd95e462a8edaacb6e25c119e02b9aa0c657a3.tar.gz scummvm-rg350-f1cd95e462a8edaacb6e25c119e02b9aa0c657a3.tar.bz2 scummvm-rg350-f1cd95e462a8edaacb6e25c119e02b9aa0c657a3.zip | |
Simplify SCI3 relocation code, also making it correct.
svn-id: r54985
| -rw-r--r-- | engines/sci/engine/script.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/engines/sci/engine/script.cpp b/engines/sci/engine/script.cpp index 789df63e87..e46c2bd15a 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), |