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

Fix through load crash when rear unit is longer than platform with no capacity

Browse Source
This commit is contained in:
Jonathan G Rennison
2021-03-28 13:48:35 +01:00
parent 912c62d749
commit 48498969eb
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/train_cmd.cpp
View File

@@ -439,8 +439,19 @@ int GetTrainStopLocation(StationID station_id, TileIndex tile, Train *v, bool up
} }
if (osl == OSL_PLATFORM_THROUGH && overhang > 0) { if (osl == OSL_PLATFORM_THROUGH && overhang > 0) {
/* The train is longer than the station, and we can run through the station to load/unload */ /* The train is longer than the station, and we can run through the station to load/unload */
bool advance_beyond_platform_end = false;
if (update_train_state) {
/* Only advance beyond platform end if there is at least one vehicle with capacity in the active part of the train.
* This avoids the entire train being beyond the platform end. */
for (Train *u = v; u != nullptr; u = u->Next()) { for (Train *u = v; u != nullptr; u = u->Next()) {
if (update_train_state && overhang > 0 && !HasBit(u->flags, VRF_BEYOND_PLATFORM_END) && !u->IsArticulatedPart()) { if (u->cargo_cap != 0) {
advance_beyond_platform_end = true;
break;
}
}
}
for (Train *u = v; u != nullptr; u = u->Next()) {
if (advance_beyond_platform_end && overhang > 0 && !HasBit(u->flags, VRF_BEYOND_PLATFORM_END) && !u->IsArticulatedPart()) {
bool skip = true; bool skip = true;
for (const Train *part = u; part != nullptr; part = part->HasArticulatedPart() ? part->GetNextArticulatedPart() : nullptr) { for (const Train *part = u; part != nullptr; part = part->HasArticulatedPart() ? part->GetNextArticulatedPart() : nullptr) {
if (part->cargo_cap != 0) { if (part->cargo_cap != 0) {