From 1b9775479d0306b48b76761a534c33ed0c6c3d22 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Sun, 5 Aug 2018 10:47:13 +0100 Subject: [PATCH] Fix incorrect vehicle alignment when entering bridge from W,N directions --- src/train_cmd.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp index 457963e0cf..5bdd9efeca 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -3149,6 +3149,10 @@ bool TrainController(Train *v, Vehicle *nomove, bool reverse) goto invalid_rail; } if (old_direction != v->direction) notify_direction_changed(old_direction, v->direction); + DiagDirection dir = GetTunnelBridgeDirection(gp.old_tile); + const byte *b = _initial_tile_subcoord[AxisToTrack(DiagDirToAxis(dir))][dir]; + gp.x = (gp.x & ~0xF) | b[0]; + gp.y = (gp.y & ~0xF) | b[1]; } if (!(v->track & TRACK_BIT_WORMHOLE)) { /* Not inside tunnel */