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

Fix wrong track piece being used in ConsistChanged after a rail type change

Browse Source
This commit is contained in:
Jonathan G Rennison
2019-03-07 22:59:54 +00:00
parent 74ab27dd8c
commit 5be04b6427
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/train_cmd.cpp
View File

@@ -4127,13 +4127,13 @@ bool TrainController(Train *v, Vehicle *nomove, bool reverse)
if (v->Next() == NULL && !(v->track & TRACK_BIT_WORMHOLE)) ClearPathReservation(v, v->tile, v->GetVehicleTrackdir(), true); if (v->Next() == NULL && !(v->track & TRACK_BIT_WORMHOLE)) ClearPathReservation(v, v->tile, v->GetVehicleTrackdir(), true);
v->tile = gp.new_tile; v->tile = gp.new_tile;
if (GetTileRailTypeByTrackBit(gp.new_tile, chosen_track) != GetTileRailTypeByTrackBit(gp.old_tile, v->track)) {
v->First()->ConsistChanged(CCF_TRACK);
}
v->track = chosen_track; v->track = chosen_track;
assert(v->track); assert(v->track);
if (GetTileRailTypeByTrackBit(gp.new_tile, chosen_track) != GetTileRailTypeByTrackBit(gp.old_tile, old_trackbits)) {
/* v->track and v->tile must both be valid and consistent before this is called */
v->First()->ConsistChanged(CCF_TRACK);
}
} }
/* We need to update signal status, but after the vehicle position hash /* We need to update signal status, but after the vehicle position hash