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

Fix missing stop due to speed when entering station with lookahead

Browse Source
This commit is contained in:
Jonathan G Rennison
2021-01-28 22:22:11 +00:00
parent d913083c37
commit 628077d0bb
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/train_cmd.cpp
View File

@@ -928,15 +928,7 @@ Train::MaxSpeedInfo Train::GetCurrentMaxSpeedInfo() const
int distance_to_go = station_ahead / TILE_SIZE - (station_length - stop_at) / TILE_SIZE; int distance_to_go = station_ahead / TILE_SIZE - (station_length - stop_at) / TILE_SIZE;
if (distance_to_go > 0) { if (distance_to_go > 0) {
int st_max_speed = 120; advisory_max_speed = min(advisory_max_speed, 15 * distance_to_go);
int delta_v = this->cur_speed / (distance_to_go + 1);
if (advisory_max_speed > (this->cur_speed - delta_v)) {
st_max_speed = this->cur_speed - (delta_v / 10);
}
st_max_speed = max(st_max_speed, 25 * distance_to_go);
advisory_max_speed = min(advisory_max_speed, st_max_speed);
} }
} }
} }