Mercurial > hg > openttd
changeset 8902:4b63a1a768fe draft
(svn r12669) -Fix (r12667): crash when a vehicle has never been to a station and the load percentage conditional variable is evaluated.
| author | rubidium <rubidium@openttd.org> |
|---|---|
| date | Sat, 12 Apr 2008 12:51:16 +0000 |
| parents | f30afabf2b45 |
| children | d15e125c0b6a |
| files | src/vehicle.cpp |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -2150,13 +2150,13 @@ bool loading = false; const Vehicle *u = v; - const Station *st = GetStation(v->last_station_visited); + const Station *st = v->last_station_visited != INVALID_STATION ? GetStation(v->last_station_visited) : NULL; /* Count up max and used */ for (; v != NULL; v = v->Next()) { count += v->cargo.Count(); max += v->cargo_cap; - if (v->cargo_cap != 0) { + if (v->cargo_cap != 0 && color != NULL) { unloading += HasBit(v->vehicle_flags, VF_CARGO_UNLOADING) ? 1 : 0; loading |= !(u->current_order.GetUnloadType() & OUFB_UNLOAD) && st->goods[v->cargo_type].days_since_pickup != 255; cars++;