(svn r21836) -Fix: when a train was reversed while inside a tunnel/bridge, it wouldn't have (re)set the GOINGUP/DOWN bits after leaving the tunnel/bridge

1 files changed, 5 insertions, 0 deletions

diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp
index a96d87b25..93d91f4c3 100644
--- a/src/train_cmd.cpp
+++ b/src/train_cmd.cpp
@@ -3146,6 +3146,11 @@ static void TrainController(Train *v, Vehicle *nomove)
 					TryReserveRailTrack(gp.new_tile, DiagDirToDiagTrack(GetTunnelBridgeDirection(gp.new_tile)));
 					CheckNextTrainTile(v);
 				}
+				/* Prevent v->UpdateInclination() being called with wrong parameters.
+				 * This could happen if the train was reversed inside the tunnel/bridge. */
+				if (gp.old_tile == gp.new_tile) {
+					gp.old_tile = GetOtherTunnelBridgeEnd(gp.old_tile);
+				}
 			} else {
 				v->x_pos = gp.x;
 				v->y_pos = gp.y;