[Scummvm-cvs-logs] SF.net SVN: scummvm:[42471] scummvm/trunk/engines/cruise

[dreammaster at users.sourceforge.net]

Revision: 42471
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42471&view=rev
Author:   dreammaster
Date:     2009-07-14 10:26:56 +0000 (Tue, 14 Jul 2009)

Log Message:
-----------
Bugfix for player being able to walk through some objects against room walls

Modified Paths:
--------------
    scummvm/trunk/engines/cruise/actor.cpp
    scummvm/trunk/engines/cruise/ctp.cpp

Modified: scummvm/trunk/engines/cruise/actor.cpp
===================================================================
--- scummvm/trunk/engines/cruise/actor.cpp	2009-07-14 09:44:56 UTC (rev 42470)
+++ scummvm/trunk/engines/cruise/actor.cpp	2009-07-14 10:26:56 UTC (rev 42471)
@@ -528,7 +528,7 @@
 					return;
 				}
 
-				/****** COUPE LE CHEMIN ******/
+				/****** Trim down any un-necessary walk points ******/
 
 				i++;
 				d = 0;

Modified: scummvm/trunk/engines/cruise/ctp.cpp
===================================================================
--- scummvm/trunk/engines/cruise/ctp.cpp	2009-07-14 09:44:56 UTC (rev 42470)
+++ scummvm/trunk/engines/cruise/ctp.cpp	2009-07-14 10:26:56 UTC (rev 42471)
@@ -106,7 +106,7 @@
 	int16 *destination;
 
 	int startX = X - ((upscaleValue(hotPointX, scale) + 0x8000) >> 16);
-//	int startY = Y - ((upscaleValue(hotPointY, scale) + 0x8000) >> 16);
+	int startY = Y - ((upscaleValue(hotPointY, scale) + 0x8000) >> 16);
 
 	numPoints = *(walkboxData++);
 
@@ -117,7 +117,7 @@
 		int pointY = *(walkboxData++);
 
 		int scaledX = ((upscaleValue(pointX, scale) + 0x8000) >> 16) + startX;
-		int scaledY = ((upscaleValue(pointY, scale) + 0x8000) >> 16) + startX;
+		int scaledY = ((upscaleValue(pointY, scale) + 0x8000) >> 16) + startY;
 
 		*(destination++) = scaledX;
 		*(destination++) = scaledY;


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