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

Fix train overshot station advice message being shown to all companies

Browse Source
This commit is contained in:
Jonathan G Rennison
2021-03-14 20:41:17 +00:00
parent 3f4333bcc8
commit d6b5d6778e
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/station_cmd.cpp
View File

@@ -3644,12 +3644,14 @@ static VehicleEnterTileStatus VehicleEnter_Station(Vehicle *v, TileIndex tile, i
if (x == stop) { if (x == stop) {
if (_settings_game.vehicle.train_braking_model == TBM_REALISTIC && front->cur_speed > 15 && !(front->lookahead != nullptr && HasBit(front->lookahead->flags, TRLF_APPLY_ADVISORY))) { if (_settings_game.vehicle.train_braking_model == TBM_REALISTIC && front->cur_speed > 15 && !(front->lookahead != nullptr && HasBit(front->lookahead->flags, TRLF_APPLY_ADVISORY))) {
/* Travelling too fast, do not stop and report overshoot to player */ /* Travelling too fast, do not stop and report overshoot to player */
if (front->owner == _local_company) {
SetDParam(0, front->index); SetDParam(0, front->index);
SetDParam(1, IsRailWaypointTile(tile) ? STR_WAYPOINT_NAME : STR_STATION_NAME); SetDParam(1, IsRailWaypointTile(tile) ? STR_WAYPOINT_NAME : STR_STATION_NAME);
SetDParam(2, station_id); SetDParam(2, station_id);
AddNewsItem(STR_NEWS_TRAIN_OVERSHOT_STATION, NT_ADVICE, NF_INCOLOUR | NF_SMALL | NF_VEHICLE_PARAM0, AddNewsItem(STR_NEWS_TRAIN_OVERSHOT_STATION, NT_ADVICE, NF_INCOLOUR | NF_SMALL | NF_VEHICLE_PARAM0,
NR_VEHICLE, v->index, NR_VEHICLE, v->index,
NR_STATION, station_id); NR_STATION, station_id);
}
for (Train *u = front; u != nullptr; u = u->Next()) { for (Train *u = front; u != nullptr; u = u->Next()) {
ClrBit(u->flags, VRF_BEYOND_PLATFORM_END); ClrBit(u->flags, VRF_BEYOND_PLATFORM_END);
} }