diff options
| author | frosch <frosch@openttd.org> | 2013-04-13 13:42:08 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2013-04-13 13:42:08 +0000 |
| commit | 5eddbb338b7838c01087921c77c0738fc12cbfb2 (patch) | |
| tree | e1d1b917bc00b6e7e43aad49188c98b635887b12 /src/vehicle.cpp | |
| parent | 8d1d521456c57b69243853b369ecc60de0421e33 (diff) | |
| download | openttd-5eddbb338b7838c01087921c77c0738fc12cbfb2.tar.xz | |
(svn r25185) -Fix [FS#5508]: Remove ambivalent functions CargoList::Empty() and Count(), and replace them with VehicleCargoList::StoredCount(), TotalCount(), StationCargoList::AvailableCount() and TotalCount(). (fonsinchen)
Diffstat (limited to 'src/vehicle.cpp')
| -rw-r--r-- | src/vehicle.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/vehicle.cpp b/src/vehicle.cpp index caadbf49d..edbdd01e3 100644 --- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -189,7 +189,8 @@ uint Vehicle::Crash(bool flooded) if (this->IsPrimaryVehicle()) this->vehstatus |= VS_STOPPED; /* crash all wagons, and count passengers */ for (Vehicle *v = this; v != NULL; v = v->Next()) { - if (IsCargoInClass(v->cargo_type, CC_PASSENGERS)) pass += v->cargo.Count(); + /* We do not transfer reserver cargo back, so TotalCount() instead of StoredCount() */ + if (IsCargoInClass(v->cargo_type, CC_PASSENGERS)) pass += v->cargo.TotalCount(); v->vehstatus |= VS_CRASHED; MarkSingleVehicleDirty(v); } @@ -1256,7 +1257,7 @@ uint8 CalcPercentVehicleFilled(const Vehicle *front, StringID *colour) /* Count up max and used */ for (const Vehicle *v = front; v != NULL; v = v->Next()) { - count += v->cargo.OnboardCount(); + count += v->cargo.StoredCount(); max += v->cargo_cap; if (v->cargo_cap != 0 && colour != NULL) { unloading += HasBit(v->vehicle_flags, VF_CARGO_UNLOADING) ? 1 : 0; |