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

[thebluegr at users.sourceforge.net]

Revision: 55123
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55123&view=rev
Author:   thebluegr
Date:     2011-01-04 23:19:04 +0000 (Tue, 04 Jan 2011)

Log Message:
-----------
SCI: Cleanup

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

Modified: scummvm/trunk/engines/sci/engine/script.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/script.cpp	2011-01-04 23:11:19 UTC (rev 55122)
+++ scummvm/trunk/engines/sci/engine/script.cpp	2011-01-04 23:19:04 UTC (rev 55123)
@@ -595,10 +595,7 @@
 								// #3150767.
 								// Same happens with script 764, it seems to
 								// contain junk towards its end.
-								if (getSciVersion() < SCI_VERSION_1_1)
-									addr.offset += 8;
-
-								_objects.erase(addr.toUint16());
+								_objects.erase(addr.toUint16() + (getSciVersion() < SCI_VERSION_1_1) ? 8 : 0);
 							} else {
 								error("Failed to locate base object for object at %04X:%04X", PRINT_REG(addr));
 							}


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