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

TBTR: Check for mixed virtual/non-virtual consists on load

Browse Source
This commit is contained in:
Jonathan G Rennison
2019-07-11 03:15:40 +01:00
parent f1946af707
commit bba36aef1b
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/saveload/vehicle_sl.cpp
View File

@@ -252,8 +252,13 @@ void AfterLoadVehicles(bool part_of_load)
FOR_ALL_VEHICLES(v) { FOR_ALL_VEHICLES(v) {
/* Reinstate the previous pointer */ /* Reinstate the previous pointer */
if (v->Next() != NULL) v->Next()->previous = v; if (v->Next() != nullptr) {
if (v->NextShared() != NULL) v->NextShared()->previous_shared = v; v->Next()->previous = v;
if (HasBit(v->subtype, GVSF_VIRTUAL) != HasBit(v->Next()->subtype, GVSF_VIRTUAL)) {
SlErrorCorrupt("Mixed virtual/non-virtual vehicle consist");
}
}
if (v->NextShared() != nullptr) v->NextShared()->previous_shared = v;
if (part_of_load) v->fill_percent_te_id = INVALID_TE_ID; if (part_of_load) v->fill_percent_te_id = INVALID_TE_ID;
v->first = NULL; v->first = NULL;