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/train.h | |
| 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/train.h')
| -rw-r--r-- | src/train.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/train.h b/src/train.h index 2e118889f..8f4bc2a9b 100644 --- a/src/train.h +++ b/src/train.h @@ -199,7 +199,7 @@ protected: // These functions should not be called outside acceleration code. */ inline uint16 GetWeight() const { - uint16 weight = (CargoSpec::Get(this->cargo_type)->weight * this->cargo.Count() * FreightWagonMult(this->cargo_type)) / 16; + uint16 weight = (CargoSpec::Get(this->cargo_type)->weight * this->cargo.StoredCount() * FreightWagonMult(this->cargo_type)) / 16; /* Vehicle weight is not added for articulated parts. */ if (!this->IsArticulatedPart()) { |