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

[m_kiewitz at users.sourceforge.net]

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

Log Message:
-----------
SCI: sci2+ has a different kSetCursor order

fixes gk1 mouse cursor issue
thx to wjp

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 21:16:36 UTC (rev 51167)
+++ scummvm/trunk/engines/sci/engine/kgraphics.cpp	2010-07-22 21:40:10 UTC (rev 51168)
@@ -144,14 +144,19 @@
 		g_sci->_gfxCursor->kernelSetPos(pos);
 		break;
 	case 4: {
-		int16 top = argv[0].toSint16();
-		int16 left = argv[1].toSint16();
-		int16 bottom = argv[2].toSint16();
-		int16 right = argv[3].toSint16();
+		int16 top, left, bottom, right;
 
-		// In SCI32, the right parameter seems to be divided by 2
-		if (getSciVersion() >= SCI_VERSION_2)
-			right *= 2;
+		if (getSciVersion() >= SCI_VERSION_2) {
+			top = argv[1].toSint16();
+			left = argv[0].toSint16();
+			bottom = argv[3].toSint16();
+			right = argv[2].toSint16();
+		} else {
+			top = argv[0].toSint16();
+			left = argv[1].toSint16();
+			bottom = argv[2].toSint16();
+			right = argv[3].toSint16();
+		}
 
 		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.