From ec736d8b403b93136545787bc2edc63b7c3cce02 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Sat, 2 Feb 2019 01:03:23 +0000 Subject: [PATCH] Revert "Fix: Don't increase motion counter while train is waiting at non-path signals (Author: frosch123) #5877 (#7018)" This reverts commit e934f09f02a022c7ef3d54879ce6c07454c098a6. --- src/train_cmd.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp index e80c4307e4..6cb6810d9b 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -3988,12 +3988,12 @@ bool TrainController(Train *v, Vehicle *nomove, bool reverse) if (!HasSignalOnTrackdir(gp.new_tile, ReverseTrackdir(i))) { v->cur_speed = 0; v->subspeed = 0; - v->progress = 255; // make sure that every bit of acceleration will hit the signal again, so speed stays 0. + v->progress = 255 - 100; if (!_settings_game.pf.reverse_at_signals || ++v->wait_counter < _settings_game.pf.wait_oneway_signal * 20) return false; } else if (HasSignalOnTrackdir(gp.new_tile, i)) { v->cur_speed = 0; v->subspeed = 0; - v->progress = 255; // make sure that every bit of acceleration will hit the signal again, so speed stays 0. + v->progress = 255 - 10; if (!_settings_game.pf.reverse_at_signals || ++v->wait_counter < _settings_game.pf.wait_twoway_signal * 73) { DiagDirection exitdir = TrackdirToExitdir(i); TileIndex o_tile = TileAddByDiagDir(gp.new_tile, exitdir);