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

bluegr md5 at scummvm.org
Thu Mar 3 19:46:45 CET 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:
f9354eb4d8 SCI: Fixed comment in pointerComparisonWithInteger()


Commit: f9354eb4d8c6ff02c801d936b5278c6d76d90f88
    https://github.com/scummvm/scummvm/commit/f9354eb4d8c6ff02c801d936b5278c6d76d90f88
Author: md5 (md5 at scummvm.org)
Date: 2011-03-03T10:45:22-08:00

Commit Message:
SCI: Fixed comment in pointerComparisonWithInteger()

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 c2119aa..17b08a5 100644
--- a/engines/sci/engine/vm_types.cpp
+++ b/engines/sci/engine/vm_types.cpp
@@ -211,13 +211,13 @@ bool reg_t::pointerComparisonWithInteger(const reg_t right) const {
 	// It works because in those games, the maximum resource number is 999,
 	// so any parameter value above that threshold must be a pointer.
 	// PQ2 japanese compares pointers to 2000 to find out if its a pointer
-	// or a resource ID.
-	// There are cases where game scripts check for arbitrary numbers against
-	// pointers, e.g.:
+	// or a resource ID. Thus, we check for all integers <= 2000.
+	//
+	// Some examples where game scripts check for arbitrary numbers against
+	// pointers:
 	// 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
-	// Thus we check for all integers <= 2000
 	return (isPointer() && right.isNumber() && right.offset <= 2000 && getSciVersion() <= SCI_VERSION_1_LATE);
 }
 






More information about the Scummvm-git-logs mailing list