(svn r3321) - Fix: A wrong use of the map m5 bits, where a previously calculated "bits" variable should have been used. This resulted in the pathfinder imagining junctions, which negatively affects performance somewhat (Darkvater).

- Fix: [ 1346377 ] Limiting the "depth" of the search tree fixes this assert.
  Though the above fix seems to fix this bug too, it will only make it less likely to occur. The problem here was the StackedItem::depth field overflowing, which made the pathfinder think it was at the first tile again. Adding an explicit overflow check should fix this.

1 files changed, 3 insertions, 1 deletions

diff --git a/pathfind.c b/pathfind.c
index a359a75a4..2895a8026 100644
--- a/pathfind.c
+++ b/pathfind.c
@@ -764,7 +764,7 @@ start_at:
 
 			// The tile has no reachable tracks, or
 			// does the tile contain more than one track?
-			if (bits == 0 || KILL_FIRST_BIT(GB(_m[tile].m5, 0, 6)) != 0)
+			if (bits == 0 || KILL_FIRST_BIT(bits) != 0)
 				break;
 
 			// If we reach here, the tile has exactly one track, and this
@@ -859,6 +859,8 @@ start_at:
 			estimation = DistanceMoo(tile, tpf->dest);
 
 		si.depth++;
+		if (si.depth == 0)
+			continue; /* We overflowed our depth. No more searching in this direction. */
 		si.tile = tile;
 		do {
 			si.track = _new_track[FIND_FIRST_BIT(bits)][direction];