Apply limit train acceleration setting before acceleration scaling

See: #699
pull/702/head
Jonathan G Rennison 2 weeks ago
parent c3829f5088
commit 226c3d5d17

@ -311,13 +311,13 @@ GroundVehicleAcceleration GroundVehicle<T, Type>::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 };

Loading…
Cancel
Save