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

[kirben at users.sourceforge.net]

Revision: 21837
Author:   kirben
Date:     2006-04-13 02:43:27 -0700 (Thu, 13 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21837&view=rev

Log Message:
-----------
Minor fixes to scrolling in FF

Modified Paths:
--------------
    scummvm/trunk/engines/simon/simon.cpp
    scummvm/trunk/engines/simon/vga.cpp
Modified: scummvm/trunk/engines/simon/simon.cpp
===================================================================
--- scummvm/trunk/engines/simon/simon.cpp	2006-04-13 07:16:42 UTC (rev 21836)
+++ scummvm/trunk/engines/simon/simon.cpp	2006-04-13 09:43:27 UTC (rev 21837)
@@ -2251,6 +2251,9 @@
 	_windowNum = mode;
 	_lockWord |= 0x20;
 
+	if (getGameType() == GType_FF)
+		vga_res_id &= 0xFFFF;
+
 	if (vga_res_id == 0) {
 		if (getGameType() == GType_SIMON1) {
 			_unkPalFlag = true;
@@ -2306,7 +2309,7 @@
 		_scrollCount = 0;
 		_scrollFlag = 0;
 		_scrollHeight = 134;
-		if (_variableArray[34] != -1) {
+		if (_variableArray[34] >= 0) {
 			if (getGameType() == GType_FF)
 				_variableArray[250] = 0;
 			_variableArray[251] = 0;

Modified: scummvm/trunk/engines/simon/vga.cpp
===================================================================
--- scummvm/trunk/engines/simon/vga.cpp	2006-04-13 07:16:42 UTC (rev 21836)
+++ scummvm/trunk/engines/simon/vga.cpp	2006-04-13 09:43:27 UTC (rev 21837)
@@ -1292,7 +1292,7 @@
 	_scrollYMax = 0;
 	_scrollImage = state->depack_src;
 	_scrollHeight = state->height;
-	if (_variableArray[34] == -1)
+	if (_variableArray[34] < 0)
 		state->x = _variableArray[251];
 
 	_scrollX = state->x;
@@ -1324,7 +1324,7 @@
 	_scrollYMax = state->height - 480;
 	_scrollImage = state->depack_src;
 	_scrollWidth = state->width;
-	if (_variableArray[34] == -1)
+	if (_variableArray[34] < 0)
 		state->y = _variableArray[250];
 
 	_scrollY = state->y;


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