dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix trains passing signals in original acceleration with braking models

Browse Source
This commit is contained in:
Jonathan G Rennison
2021-03-01 02:14:42 +00:00
parent c37beb78ee
commit dbbe1bb3e4
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/train_cmd.cpp
View File

@@ -4319,7 +4319,7 @@ int Train::UpdateSpeed()
switch (_settings_game.vehicle.train_acceleration_model) { switch (_settings_game.vehicle.train_acceleration_model) {
default: NOT_REACHED(); default: NOT_REACHED();
case AM_ORIGINAL: 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: 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); return this->DoUpdateSpeed(this->GetAcceleration(), accel_status == AS_BRAKE ? 0 : 2, max_speed_info.strict_max_speed, max_speed_info.advisory_max_speed);