[Scummvm-cvs-logs] scummvm master -> eb8b1a962b26ffe9af003a2045aade36734240cb

wjp wjp at usecode.org
Wed Apr 20 23:40:11 CEST 2011


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
eb8b1a962b SCI: Fix precedence (bug #3087872)


Commit: eb8b1a962b26ffe9af003a2045aade36734240cb
    https://github.com/scummvm/scummvm/commit/eb8b1a962b26ffe9af003a2045aade36734240cb
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2011-04-20T14:38:28-07:00

Commit Message:
SCI: Fix precedence (bug #3087872)

Changed paths:
    engines/sci/engine/script.cpp



diff --git a/engines/sci/engine/script.cpp b/engines/sci/engine/script.cpp
index fb96518..25bf91c 100644
--- a/engines/sci/engine/script.cpp
+++ b/engines/sci/engine/script.cpp
@@ -611,7 +611,7 @@ void Script::initialiseObjectsSci0(SegManager *segMan, SegmentId segmentId) {
 								// #3150767.
 								// Same happens with script 764, it seems to
 								// contain junk towards its end.
-								_objects.erase(addr.toUint16() + (getSciVersion() < SCI_VERSION_1_1) ? 8 : 0);
+								_objects.erase(addr.toUint16() - SCRIPT_OBJECT_MAGIC_OFFSET);
 							} else {
 								error("Failed to locate base object for object at %04X:%04X", PRINT_REG(addr));
 							}






More information about the Scummvm-git-logs mailing list