[Scummvm-cvs-logs] SF.net SVN: scummvm:[44784] scummvm/trunk/engines/sci/gui/gui_gfx.cpp

[m_kiewitz at users.sourceforge.net]

Revision: 44784
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44784&view=rev
Author:   m_kiewitz
Date:     2009-10-08 11:57:17 +0000 (Thu, 08 Oct 2009)

Log Message:
-----------
SCI/newgui: change to nsRect, scripts expect that. Fixes mouse clicking on several games

Modified Paths:
--------------
    scummvm/trunk/engines/sci/gui/gui_gfx.cpp

Modified: scummvm/trunk/engines/sci/gui/gui_gfx.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_gfx.cpp	2009-10-08 11:49:11 UTC (rev 44783)
+++ scummvm/trunk/engines/sci/gui/gui_gfx.cpp	2009-10-08 11:57:17 UTC (rev 44784)
@@ -1139,16 +1139,12 @@
 			PUT_SEL32V(curObject, cel, celNo);
 		}
 
-		// Adjust given rect to cel
-		celRect.left = GET_SEL32V(curObject, lsLeft);
-		celRect.top = GET_SEL32V(curObject, lsTop);
-		celRect.right = GET_SEL32V(curObject, lsRight);
-		celRect.bottom = GET_SEL32V(curObject, lsBottom);
+		// Create rect according to coordinates and given cel
 		view->getCelRect(loopNo, celNo, x, y, priority, &celRect);
-		PUT_SEL32V(curObject, lsLeft, celRect.left);
-		PUT_SEL32V(curObject, lsTop, celRect.top);
-		PUT_SEL32V(curObject, lsRight, celRect.right);
-		PUT_SEL32V(curObject, lsBottom, celRect.bottom);
+		PUT_SEL32V(curObject, nsLeft, celRect.left);
+		PUT_SEL32V(curObject, nsTop, celRect.top);
+		PUT_SEL32V(curObject, nsRight, celRect.right);
+		PUT_SEL32V(curObject, nsBottom, celRect.bottom);
 
 		if (!(mask & SCI_ANIMATE_MASK_FIXEDPRIORITY))
 			PUT_SEL32V(curObject, priority, 0); // CoordPri(y) FIXME
@@ -1238,10 +1234,10 @@
 			priority = GET_SEL32V(curObject, priority);
 			paletteNo = GET_SEL32V(curObject, palette);
 
-			celRect.left = GET_SEL32V(curObject, lsLeft);
-			celRect.top = GET_SEL32V(curObject, lsTop);
-			celRect.right = GET_SEL32V(curObject, lsRight);
-			celRect.bottom = GET_SEL32V(curObject, lsBottom);
+			celRect.left = GET_SEL32V(curObject, nsLeft);
+			celRect.top = GET_SEL32V(curObject, nsTop);
+			celRect.right = GET_SEL32V(curObject, nsRight);
+			celRect.bottom = GET_SEL32V(curObject, nsBottom);
 
 			//hSaved = SaveBits(rect, SCI_SCREEN_MASK_ALL);
 			//PUT_SEL32V(curObject, 11, hSaved.toUint16());


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