From 35c3ef9d35abb15e5a999285d2dd6b6556338be2 Mon Sep 17 00:00:00 2001
From: Per Inge Mathisen <per@wz2100.net>
Date: Sun, 10 Jan 2010 22:07:59 +0000
Subject: [PATCH] When picking a tile based on a given start coordinate, make
 sure the result coordinate is on the same continent as the start coordinate.
 This hopefully fixes ticket:1385

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9112 4a71c877-e1ca-e34f-864e-861f7616d084
---
 src/droid.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/droid.c b/src/droid.c
index 18cb8154c..67bdfdd80 100644
--- a/src/droid.c
+++ b/src/droid.c
@@ -3646,10 +3646,10 @@ BOOL	pickATileGen(UDWORD *x, UDWORD *y, UBYTE numIterations,
 BOOL	pickATileGenThreat(UDWORD *x, UDWORD *y, UBYTE numIterations, SDWORD threatRange,
 					 SDWORD player, BOOL (*function)(UDWORD x, UDWORD y))
 {
-SDWORD	i,j;
-SDWORD	startX,endX,startY,endY;
-UDWORD	passes;
-
+	SDWORD		i, j;
+	SDWORD		startX, endX, startY, endY;
+	UDWORD		passes;
+	Vector2i	origin = { *x, *y };
 
 	ASSERT_OR_RETURN(false, *x<mapWidth,"x coordinate is off-map for pickATileGen" );
 	ASSERT_OR_RETURN(false, *y<mapHeight,"y coordinate is off-map for pickATileGen" );
@@ -3673,8 +3673,12 @@ UDWORD	passes;
 				/* Test only perimeter as internal tested previous iteration */
 				if(i==startX || i==endX || j==startY || j==endY)
 				{
+					Vector2i newPos = { i, j };
+
 					/* Good enough? */
-					if(function(i,j) && ((threatRange <=0) || (!ThreatInRange(player, threatRange, world_coord(i), world_coord(j), false))))		//TODO: vtols check really not needed?
+					if (function(i, j)
+					    && fpathCheck(origin, newPos, PROPULSION_TYPE_WHEELED)
+					    && ((threatRange <= 0) || (!ThreatInRange(player, threatRange, world_coord(i), world_coord(j), false))))
 					{
 						/* Set exit conditions and get out NOW */
 						*x = i;	*y = j;