From dbbe1bb3e485b0eb00e5b49e4e4a470538e2279e Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Mon, 1 Mar 2021 02:14:42 +0000 Subject: [PATCH] Fix trains passing signals in original acceleration with braking models --- src/train_cmd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp index 8879218d74..b19bd98162 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -4319,7 +4319,7 @@ int Train::UpdateSpeed() switch (_settings_game.vehicle.train_acceleration_model) { default: NOT_REACHED(); case AM_ORIGINAL: - return this->DoUpdateSpeed({ this->acceleration * 2, this->acceleration * -4 }, 0, max_speed_info.strict_max_speed, max_speed_info.advisory_max_speed); + return this->DoUpdateSpeed({ this->acceleration * (this->GetAccelerationStatus() == AS_BRAKE ? -4 : 2), this->acceleration * -4 }, 0, max_speed_info.strict_max_speed, max_speed_info.advisory_max_speed); case AM_REALISTIC: return this->DoUpdateSpeed(this->GetAcceleration(), accel_status == AS_BRAKE ? 0 : 2, max_speed_info.strict_max_speed, max_speed_info.advisory_max_speed);