From 226c3d5d17e5387d9fe205fa41d3af26f65089c7 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Wed, 5 Jun 2024 19:04:49 +0100 Subject: [PATCH] Apply limit train acceleration setting before acceleration scaling See: #699 --- src/ground_vehicle.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ground_vehicle.cpp b/src/ground_vehicle.cpp index 7aab92c50d..29fe849627 100644 --- a/src/ground_vehicle.cpp +++ b/src/ground_vehicle.cpp @@ -311,13 +311,13 @@ GroundVehicleAcceleration GroundVehicle::GetAcceleration() bool using_realistic_braking = Train::From(this)->UsingRealisticBraking(); - if (using_realistic_braking) { - accel = DivTowardsPositiveInf(accel * _settings_game.vehicle.train_acc_braking_percent, 100); - } - if (using_realistic_braking && _settings_game.vehicle.limit_train_acceleration) { accel = std::min(accel, 250); } + + if (using_realistic_braking) { + accel = DivTowardsPositiveInf(accel * _settings_game.vehicle.train_acc_braking_percent, 100); + } } return { accel, braking_accel };