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

[m_kiewitz at users.sourceforge.net]

Revision: 51177
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51177&view=rev
Author:   m_kiewitz
Date:     2010-07-22 22:13:25 +0000 (Thu, 22 Jul 2010)

Log Message:
-----------
SCI: kSetCursor works the same in sci16

(coordinates are not a regular Rect, but bottom/right is the last allowed coordinate)

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

Modified: scummvm/trunk/engines/sci/engine/kgraphics.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kgraphics.cpp	2010-07-22 22:04:40 UTC (rev 51176)
+++ scummvm/trunk/engines/sci/engine/kgraphics.cpp	2010-07-22 22:13:25 UTC (rev 51177)
@@ -150,14 +150,17 @@
 		if (getSciVersion() >= SCI_VERSION_2) {
 			top = argv[1].toSint16();
 			left = argv[0].toSint16();
-			bottom = argv[3].toSint16() + 1; // bottom/right needs to get included in our movezone
-			right = argv[2].toSint16() + 1;
+			bottom = argv[3].toSint16();
+			right = argv[2].toSint16();
 		} else {
 			top = argv[0].toSint16();
 			left = argv[1].toSint16();
-			bottom = argv[2].toSint16(); // TODO: check if sci16 behaved the same as sci32
+			bottom = argv[2].toSint16();
 			right = argv[3].toSint16();
 		}
+		// bottom/right needs to be included into our movezone, because we compare it like any regular Common::Rect
+		bottom++;
+		right++;
 
 		if ((right >= left) && (bottom >= top)) {
 			Common::Rect rect = Common::Rect(left, top, right, bottom);


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