[Scummvm-cvs-logs] SF.net SVN: scummvm: [21378] scummvm/trunk/engines/kyra/scene.cpp

vinterstum at users.sourceforge.net vinterstum at users.sourceforge.net
Sat Mar 18 23:55:06 CET 2006


Revision: 21378
Author:   vinterstum
Date:     2006-03-18 23:54:30 -0800 (Sat, 18 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21378&view=rev

Log Message:
-----------
Fixes a potential problem in the pathfinder where an array could be accessed with a negative value in certain rooms

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/scene.cpp
Modified: scummvm/trunk/engines/kyra/scene.cpp
===================================================================
--- scummvm/trunk/engines/kyra/scene.cpp	2006-03-19 05:55:26 UTC (rev 21377)
+++ scummvm/trunk/engines/kyra/scene.cpp	2006-03-19 07:54:30 UTC (rev 21378)
@@ -1455,6 +1455,10 @@
 	if (y > 137) {
 		return false;
 	}
+
+	if (y < 0) {
+		y = 0;
+	}
 	
 	int ypos = 8;
 	if (_scaleMode) {
@@ -1464,8 +1468,6 @@
 	}
 	
 	x -= (ypos >> 1);
-	if (y < 0)
-		y = 0;
 	
 	int xpos = x;
 	int xtemp = xpos + ypos - 1;


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