From afcf48080c5bfaa7256bfbbd6692cae8cc99c2fa Mon Sep 17 00:00:00 2001
From: zaxcav <daveanti@gmail.com>
Date: Fri, 2 Dec 2016 10:10:23 +0100
Subject: [PATCH] When choosing a direction, repair
 pathfind_history[i].direction.

Remove directions that are not permitted by the path element(s) at that location.
---
 src/peep/peep.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/peep/peep.c b/src/peep/peep.c
index 22c2c620e9..9bf5d9abd4 100644
--- a/src/peep/peep.c
+++ b/src/peep/peep.c
@@ -9529,7 +9529,17 @@ int peep_pathfind_choose_direction(sint16 x, sint16 y, uint8 z, rct_peep *peep)
 			if (peep->pathfind_history[i].x == x / 32 &&
 					peep->pathfind_history[i].y == y / 32 &&
 					peep->pathfind_history[i].z == z) {
-				edges = peep->pathfind_history[i].direction & 0xF;
+
+				/* Fix broken pathfind_history[i].direction
+				 * which have untried directions that are not
+				 * currently possible - could be due to pathing
+				 * changes or in earlier code .directions was
+				 * initialised to 0xF rather than the permitted
+				 * edges. */
+				peep->pathfind_history[i].direction &= permitted_edges;
+
+				edges = peep->pathfind_history[i].direction;
+
 				#if defined(DEBUG_LEVEL_1) && DEBUG_LEVEL_1
 				if (gPathFindDebug) {
 					log_verbose("Getting untried edges from pf_history for %d,%d,%d:  %s,%s,%s,%s", x >> 5, y >> 5, z, (edges & 1) ? "0" : "-", (edges & 2) ? "1" : "-", (edges & 4) ? "2" : "-", (edges & 8) ? "3" : "-");
@@ -9540,8 +9550,6 @@ int peep_pathfind_choose_direction(sint16 x, sint16 y, uint8 z, rct_peep *peep)
 		}
 	}
 
-	// Remove any edges that are not permitted
-	edges &= path_get_permitted_edges(dest_map_element);
 
 	// Peep has tried all edges.
 	if (edges == 0) return -1;