From a69eb5f516963f6f7a39f90d959cdff61e8e70b2 Mon Sep 17 00:00:00 2001
From: peter1138 <peter1138@openttd.org>
Date: Wed, 6 Mar 2019 18:27:54 +0000
Subject: Fix #7334: Ship lost after crossing bridge due to path cache not
 being consumed while on final bridge end.

---
 src/ship_cmd.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src')

diff --git a/src/ship_cmd.cpp b/src/ship_cmd.cpp
index 0f3f7b74d..6d6f8415c 100644
--- a/src/ship_cmd.cpp
+++ b/src/ship_cmd.cpp
@@ -759,6 +759,10 @@ static void ShipController(Ship *v)
 			if ((v->vehstatus & VS_HIDDEN) == 0) v->Vehicle::UpdateViewport(true);
 			return;
 		}
+
+		/* Ship is back on the bridge head, we need to comsume its path
+		 * cache entry here as we didn't have to choose a ship track. */
+		if (!v->path.empty()) v->path.pop_front();
 	}
 
 	/* update image of ship, as well as delta XY */
-- 
cgit v1.2.3-70-g09d2