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

[kirben at users.sourceforge.net]

Revision: 21928
Author:   kirben
Date:     2006-04-15 18:06:18 -0700 (Sat, 15 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21928&view=rev

Log Message:
-----------
Correct sign, to fix weird path finding issues in FF

Modified Paths:
--------------
    scummvm/trunk/engines/simon/vga.cpp
Modified: scummvm/trunk/engines/simon/vga.cpp
===================================================================
--- scummvm/trunk/engines/simon/vga.cpp	2006-04-15 23:23:55 UTC (rev 21927)
+++ scummvm/trunk/engines/simon/vga.cpp	2006-04-16 01:06:18 UTC (rev 21928)
@@ -1862,7 +1862,8 @@
 		int16 x1, y1, x2, y2;
 		uint pos = 0;
 
-		while (vsp->x >= readUint16Wrapper(p + 2)) {
+		x = vsp->x;
+		while (x >= (int16)readUint16Wrapper(p + 2)) {
 			p += 2;
 			pos++;
 		}
@@ -2426,7 +2427,7 @@
 	uint pos = 0;
 
 	int16 y = _variableArrayPtr[16];
-	while (y >= readUint16Wrapper(p + 1)) {
+	while (y >= (int16)readUint16Wrapper(p + 1)) {
 		p += 2;
 		pos++;
 	}


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