[Scummvm-cvs-logs] scummvm master -> 6a31e398f76ec37a15d1aa40d7c93b6256cdea25

[bluegr]

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:
6a31e398f7 SCI: Comparisons between pointers and numbers are also done in SCI1.1


Commit: 6a31e398f76ec37a15d1aa40d7c93b6256cdea25
    https://github.com/scummvm/scummvm/commit/6a31e398f76ec37a15d1aa40d7c93b6256cdea25
Author: md5 (md5 at scummvm.org)
Date: 2011-03-08T03:44:09-08:00

Commit Message:
SCI: Comparisons between pointers and numbers are also done in SCI1.1

Fixes SQ4CD

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



diff --git a/engines/sci/engine/vm_types.cpp b/engines/sci/engine/vm_types.cpp
index 0b790bb..e14c0ca 100644
--- a/engines/sci/engine/vm_types.cpp
+++ b/engines/sci/engine/vm_types.cpp
@@ -193,7 +193,7 @@ int reg_t::cmp(const reg_t right, bool treatAsUnsigned) const {
 bool reg_t::pointerComparisonWithInteger(const reg_t right) const {
 	// This function handles the case where a script tries to compare a pointer
 	// to a number. Normally, we would not want to allow that. However, SCI0 -
-	// SCI1 scripts do this in order to distinguish references to
+	// SCI1.1 scripts do this in order to distinguish references to
 	// external resources (which are numbers) from pointers. In
 	// our SCI implementation, such a check may seem pointless, as
 	// one can simply use the segment value to achieve this goal.
@@ -220,7 +220,8 @@ bool reg_t::pointerComparisonWithInteger(const reg_t right) const {
 	// Hoyle 3, Pachisi, when any opponent is about to talk
 	// SQ1, room 28, when throwing water at the Orat
 	// SQ1, room 58, when giving the ID card to the robot
-	return (isPointer() && right.isNumber() && right.offset <= 2000 && getSciVersion() <= SCI_VERSION_1_LATE);
+	// SQ4 CD, at the first game screen, when the narrator is about to talk
+	return (isPointer() && right.isNumber() && right.offset <= 2000 && getSciVersion() <= SCI_VERSION_1_1);
 }
 
 } // End of namespace Sci