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

[lordhoto at users.sourceforge.net]

Revision: 28773
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28773&view=rev
Author:   lordhoto
Date:     2007-08-31 06:11:26 -0700 (Fri, 31 Aug 2007)

Log Message:
-----------
Fix for bug #1784937 ("KYRA: Wrong path for Brandon in starting location").

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/scene.cpp
    scummvm/trunk/engines/kyra/scene_v1.cpp

Modified: scummvm/trunk/engines/kyra/scene.cpp
===================================================================
--- scummvm/trunk/engines/kyra/scene.cpp	2007-08-31 11:14:32 UTC (rev 28772)
+++ scummvm/trunk/engines/kyra/scene.cpp	2007-08-31 13:11:26 UTC (rev 28773)
@@ -65,11 +65,11 @@
 				return 0x7D00;
 			}
 			// debug drawing
-			//if (curX >= 0 && curY >= 0 && curX < 320 && curY < 200) {
-			//	_screen->setPagePixel(0, curX, curY, 11);
-			//	_screen->updateScreen();
-			//	waitTicks(5);
-			//}
+			/*if (curX >= 0 && curY >= 0 && curX < 320 && curY < 200) {
+				screen()->setPagePixel(0, curX, curY, 11);
+				screen()->updateScreen();
+				//waitTicks(5);
+			}*/
 			moveTable[lastUsedEntry++] = newFacing;
 			x = curX;
 			y = curY;
@@ -81,11 +81,11 @@
 			newFacing = getFacingFromPointToPoint(curX, curY, toX, toY);
 			changePosTowardsFacing(curX, curY, newFacing);
 			// debug drawing
-			//if (curX >= 0 && curY >= 0 && curX < 320 && curY < 200) {
-			//	_screen->setPagePixel(0, curX, curY, 8);
-			//	_screen->updateScreen();
-			//	waitTicks(5);
-			//}
+			/*if (curX >= 0 && curY >= 0 && curX < 320 && curY < 200) {
+				screen()->setPagePixel(0, curX, curY, 8);
+				screen()->updateScreen();
+				//waitTicks(5);
+			}*/
 			
 			if (!lineIsPassable(curX, curY)) {
 				if (curX != toX || curY != toY)

Modified: scummvm/trunk/engines/kyra/scene_v1.cpp
===================================================================
--- scummvm/trunk/engines/kyra/scene_v1.cpp	2007-08-31 11:14:32 UTC (rev 28772)
+++ scummvm/trunk/engines/kyra/scene_v1.cpp	2007-08-31 13:11:26 UTC (rev 28773)
@@ -1166,7 +1166,9 @@
 
 int KyraEngine_v1::findWay(int x, int y, int toX, int toY, int *moveTable, int moveTableSize) {
 	debugC(9, kDebugLevelMain, "KyraEngine_v1::findWay(%d, %d, %d, %d, %p, %d)", x, y, toX, toY, (const void *)moveTable, moveTableSize);
-	KyraEngine::findWay(x, y, toX, toY, moveTable, moveTableSize);
+	int ret = KyraEngine::findWay(x, y, toX, toY, moveTable, moveTableSize);
+	if (ret == 0x7D00)
+		return 0;
 	return getMoveTableSize(moveTable);
 }
 


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