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/roadveh_gui.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/roadveh_gui.cpp')
| -rw-r--r-- | src/roadveh_gui.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/roadveh_gui.cpp b/src/roadveh_gui.cpp index 03e283062..eea416659 100644 --- a/src/roadveh_gui.cpp +++ b/src/roadveh_gui.cpp @@ -81,9 +81,9 @@ void DrawRoadVehDetails(const Vehicle *v, int left, int right, int y) if (u->cargo_cap == 0) continue; str = STR_VEHICLE_DETAILS_CARGO_EMPTY; - if (!u->cargo.Empty()) { + if (u->cargo.StoredCount() > 0) { SetDParam(0, u->cargo_type); - SetDParam(1, u->cargo.Count()); + SetDParam(1, u->cargo.StoredCount()); SetDParam(2, u->cargo.Source()); str = STR_VEHICLE_DETAILS_CARGO_FROM; feeder_share += u->cargo.FeederShare(); @@ -101,9 +101,9 @@ void DrawRoadVehDetails(const Vehicle *v, int left, int right, int y) DrawString(left, right, y + FONT_HEIGHT_NORMAL + y_offset, STR_VEHICLE_INFO_CAPACITY); str = STR_VEHICLE_DETAILS_CARGO_EMPTY; - if (!v->cargo.Empty()) { + if (v->cargo.StoredCount() > 0) { SetDParam(0, v->cargo_type); - SetDParam(1, v->cargo.Count()); + SetDParam(1, v->cargo.StoredCount()); SetDParam(2, v->cargo.Source()); str = STR_VEHICLE_DETAILS_CARGO_FROM; feeder_share += v->cargo.FeederShare(); |