From 1e358906ef6c540568788efec819851543ae0bcc Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Mon, 12 Jun 2006 06:00:52 +0000
Subject: Fix errors in centreScroll() of FF

svn-id: r23053
---
 engines/simon/vga.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/engines/simon/vga.cpp b/engines/simon/vga.cpp
index e9fb99d1ff..3d2b926aeb 100644
--- a/engines/simon/vga.cpp
+++ b/engines/simon/vga.cpp
@@ -2589,32 +2589,32 @@ void SimonEngine::centreScroll() {
 	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;
 		}
 	}
 }
-- 
cgit v1.2.3