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

Fix assert fail when building virtual train from engine with invalid cargo

Browse Source
This commit is contained in:
Jonathan G Rennison
2021-12-15 17:50:40 +00:00
parent 7953a1f8d1
commit 17d949980f
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/articulated_vehicles.cpp
View File

@@ -358,8 +358,10 @@ void CheckConsistencyOfArticulatedVehicle(const Vehicle *v)
real_refit_union |= refit_mask;
if (refit_mask != 0) real_refit_intersection &= refit_mask;
assert(v->cargo_type < NUM_CARGO);
real_default_capacity[v->cargo_type] += v->cargo_cap;
assert(v->cargo_type < NUM_CARGO || (v->type == VEH_TRAIN && Train::From(v)->IsVirtual()));
if (v->cargo_type < NUM_CARGO) {
real_default_capacity[v->cargo_type] += v->cargo_cap;
}
v = v->HasArticulatedPart() ? v->GetNextArticulatedPart() : nullptr;
} while (v != nullptr);