[Scummvm-cvs-logs] SF.net SVN: scummvm: [23053] scummvm/trunk/engines/simon/vga.cpp

kirben at users.sourceforge.net kirben at users.sourceforge.net
Mon Jun 12 08:00:58 CEST 2006


Revision: 23053
Author:   kirben
Date:     2006-06-11 23:00:52 -0700 (Sun, 11 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=23053&view=rev

Log Message:
-----------
Fix errors in centreScroll() of FF

Modified Paths:
--------------
    scummvm/trunk/engines/simon/vga.cpp
Modified: scummvm/trunk/engines/simon/vga.cpp
===================================================================
--- scummvm/trunk/engines/simon/vga.cpp	2006-06-12 05:59:53 UTC (rev 23052)
+++ scummvm/trunk/engines/simon/vga.cpp	2006-06-12 06:00:52 UTC (rev 23053)
@@ -2589,32 +2589,32 @@
 	if (_scrollXMax != 0) {
 		_scrollCount = 0;
 		x = _variableArray[15] - _scrollX;
-		if (getBitFlag(85) || x >= 624) {
+		if (x < 17 || (getBitFlag(85) && x < 320)) {
 			x -= 320;
+			if (_scrollX < -x)
+				x = -_scrollX;
+			_scrollCount = x;
+		} else if ((getBitFlag(85) && x >= 320) || x >= 624) {
+			x -= 320;
 			tmp = _scrollXMax - _scrollX;
 			if (tmp < x)
 				x = tmp;
 			_scrollCount = x;
-		} else if (x < 17) {
-			x -= 320;
-			if (_scrollX < -x)
-				x = -_scrollX;
-			_scrollCount = x;
 		}
 	} else if (_scrollYMax != 0) {
 		_scrollCount = 0;
 		y = _variableArray[16] - _scrollY;
-		if (y >= 460) {
+		if (y < 30) {
 			y -= 240;
+			if (_scrollY < -y)
+				y = -_scrollY;
+			_scrollCount = y;
+		} else if (y >= 460) {
+			y -= 240;
 			tmp = _scrollYMax - _scrollY;
 			if (tmp < y)
 				y = tmp;
 			_scrollCount = y;
-		} else if (y < 30) {
-			y -= 240;
-			if (_scrollY < -y)
-				y = -_scrollY;
-			_scrollCount = y;
 		}
 	}
 }


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