Merge branch 'template_train_replacement' into jgrpp
# Conflicts: # src/saveload/vehicle_sl.cpp # src/train.h
This commit is contained in:
@@ -390,6 +390,15 @@ void AfterLoadVehicles(bool part_of_load)
|
|||||||
s->rotation_y_pos = s->y_pos;
|
s->rotation_y_pos = s->y_pos;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (SlXvIsFeaturePresent(XSLFI_TEMPLATE_REPLACEMENT) && (_network_server || !_networking)) {
|
||||||
|
Train *t;
|
||||||
|
FOR_ALL_TRAINS(t) {
|
||||||
|
if (t->IsVirtual() && t->First() == t) {
|
||||||
|
delete t;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
v = nullptr;
|
v = nullptr;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user