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

Merge branch 'template_train_replacement' into jgrpp

Browse Source 
# Conflicts:
#	src/saveload/vehicle_sl.cpp
This commit is contained in:
Jonathan G Rennison
2019-07-11 03:16:29 +01:00
parent 0f6c5ee622 bba36aef1b
commit 97221a67f2
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/saveload/vehicle_sl.cpp
View File

@@ -254,7 +254,12 @@ void AfterLoadVehicles(bool part_of_load)
SCOPE_INFO_FMT([&v], "AfterLoadVehicles: %s", scope_dumper().VehicleInfo(v));
FOR_ALL_VEHICLES(v) {
/* Reinstate the previous pointer */
if (v->Next() != nullptr) v->Next()->previous = v;
if (v->Next() != nullptr) {
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;