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

mthreepwood at users.sourceforge.net mthreepwood at users.sourceforge.net
Tue Jan 5 02:14:08 CET 2010


Revision: 47006
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47006&view=rev
Author:   mthreepwood
Date:     2010-01-05 01:14:08 +0000 (Tue, 05 Jan 2010)

Log Message:
-----------
Disable the planeLeft/planeTop code as it doesn't work under the current code (and left a FIXME explaining why it doesn't work).

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

Modified: scummvm/trunk/engines/sci/gui/gui.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui.cpp	2010-01-05 00:54:53 UTC (rev 47005)
+++ scummvm/trunk/engines/sci/gui/gui.cpp	2010-01-05 01:14:08 UTC (rev 47006)
@@ -875,10 +875,15 @@
 
 		if (priority == -1)
 			continue;
+	
+		// FIXME: This code doesn't currently work properly because of the way we set up the
+		// view port. We are starting at 10 pixels from the top automatically. The offset should
+		// be based on the plane's top in SCI32 instead. Here we would be adding 10 to 10 and
+		// therefore drawing too low. We would need to draw each picture at the correct offset
+		// which doesn't currently happen.
+		//int16 planeTop = GET_SEL32V(_s->_segMan, planeObj, top);
+		//int16 planeLeft = GET_SEL32V(_s->_segMan, planeObj, left);
 
-		int16 planeTop = GET_SEL32V(_s->_segMan, planeObj, top);
-		int16 planeLeft = GET_SEL32V(_s->_segMan, planeObj, left);
-
 		for (uint32 itemNr = 0; itemNr < _screenItems.size(); itemNr++) {
 			reg_t viewObj = _screenItems[itemNr];
 			reg_t planeOfItem = GET_SEL32(_s->_segMan, viewObj, plane);
@@ -891,8 +896,9 @@
 				priority = GET_SEL32V(_s->_segMan, viewObj, priority);
 				//int16 signal = GET_SEL32V(_s->_segMan, viewObj, signal);
 
-				leftPos += planeLeft;
-				topPos += planeTop;
+				// FIXME: See above
+				//leftPos += planeLeft;
+				//topPos += planeTop;
 
 				// Theoretically, leftPos and topPos should be sane
 				// Apparently, sometimes they're not, therefore I'm adding some sanity checks here so that 


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




More information about the Scummvm-git-logs mailing list