[Scummvm-cvs-logs] SF.net SVN: scummvm:[54985] scummvm/trunk/engines/sci/engine/script.cpp

lskovlun at users.sourceforge.net lskovlun at users.sourceforge.net
Tue Dec 21 16:34:02 CET 2010


Revision: 54985
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54985&view=rev
Author:   lskovlun
Date:     2010-12-21 15:34:02 +0000 (Tue, 21 Dec 2010)

Log Message:
-----------
Simplify SCI3 relocation code, also making it correct.

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/script.cpp

Modified: scummvm/trunk/engines/sci/engine/script.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/script.cpp	2010-12-21 15:31:59 UTC (rev 54984)
+++ scummvm/trunk/engines/sci/engine/script.cpp	2010-12-21 15:34:02 UTC (rev 54985)
@@ -356,14 +356,8 @@
 
 	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),


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list