diff options
| author | terkhen <terkhen@openttd.org> | 2011-06-04 21:17:07 +0000 |
|---|---|---|
| committer | terkhen <terkhen@openttd.org> | 2011-06-04 21:17:07 +0000 |
| commit | 5bb79b1f46f2428f6416ad6d85b0e903ca9629b4 (patch) | |
| tree | 2a816344a24a473c987d081d10d2a303be08e6cf /src/station_gui.cpp | |
| parent | 05b125c42c0cb5e9241d96ea9d25d866094311bb (diff) | |
| download | openttd-5bb79b1f46f2428f6416ad6d85b0e903ca9629b4.tar.xz | |
(svn r22540) -Codechange: Rename AcceptancePickup to GoodsEntryStatus.
Diffstat (limited to 'src/station_gui.cpp')
| -rw-r--r-- | src/station_gui.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/station_gui.cpp b/src/station_gui.cpp index b2f5a6ed2..4078ecbbf 100644 --- a/src/station_gui.cpp +++ b/src/station_gui.cpp @@ -238,7 +238,7 @@ protected: if (this->facilities & st->facilities) { // only stations with selected facilities int num_waiting_cargo = 0; for (CargoID j = 0; j < NUM_CARGO; j++) { - if (HasBit(st->goods[j].acceptance_pickup, GoodsEntry::PICKUP)) { + if (HasBit(st->goods[j].acceptance_pickup, GoodsEntry::GES_PICKUP)) { num_waiting_cargo++; // count number of waiting cargo if (HasBit(this->cargo_filter, j)) { *this->stations.Append() = st; @@ -306,8 +306,8 @@ protected: CargoID j; FOR_EACH_SET_CARGO_ID(j, cargo_filter) { - if (HasBit((*a)->goods[j].acceptance_pickup, GoodsEntry::PICKUP)) maxr1 = max(maxr1, (*a)->goods[j].rating); - if (HasBit((*b)->goods[j].acceptance_pickup, GoodsEntry::PICKUP)) maxr2 = max(maxr2, (*b)->goods[j].rating); + if (HasBit((*a)->goods[j].acceptance_pickup, GoodsEntry::GES_PICKUP)) maxr1 = max(maxr1, (*a)->goods[j].rating); + if (HasBit((*b)->goods[j].acceptance_pickup, GoodsEntry::GES_PICKUP)) maxr2 = max(maxr2, (*b)->goods[j].rating); } return maxr1 - maxr2; @@ -321,8 +321,8 @@ protected: for (CargoID j = 0; j < NUM_CARGO; j++) { if (!HasBit(cargo_filter, j)) continue; - if (HasBit((*a)->goods[j].acceptance_pickup, GoodsEntry::PICKUP)) minr1 = min(minr1, (*a)->goods[j].rating); - if (HasBit((*b)->goods[j].acceptance_pickup, GoodsEntry::PICKUP)) minr2 = min(minr2, (*b)->goods[j].rating); + if (HasBit((*a)->goods[j].acceptance_pickup, GoodsEntry::GES_PICKUP)) minr1 = min(minr1, (*a)->goods[j].rating); + if (HasBit((*b)->goods[j].acceptance_pickup, GoodsEntry::GES_PICKUP)) minr2 = min(minr2, (*b)->goods[j].rating); } return -(minr1 - minr2); @@ -1112,7 +1112,7 @@ struct StationViewWindow : public Window { uint32 cargo_mask = 0; for (CargoID i = 0; i < NUM_CARGO; i++) { - if (HasBit(st->goods[i].acceptance_pickup, GoodsEntry::ACCEPTANCE)) SetBit(cargo_mask, i); + if (HasBit(st->goods[i].acceptance_pickup, GoodsEntry::GES_ACCEPTANCE)) SetBit(cargo_mask, i); } Rect s = {r.left + WD_FRAMERECT_LEFT, r.top + WD_FRAMERECT_TOP, r.right - WD_FRAMERECT_RIGHT, INT32_MAX}; int bottom = DrawCargoListText(cargo_mask, s, STR_STATION_VIEW_ACCEPTS_CARGO); @@ -1135,7 +1135,7 @@ struct StationViewWindow : public Window { const CargoSpec *cs; FOR_ALL_SORTED_STANDARD_CARGOSPECS(cs) { const GoodsEntry *ge = &st->goods[cs->Index()]; - if (!HasBit(ge->acceptance_pickup, GoodsEntry::PICKUP)) continue; + if (!HasBit(ge->acceptance_pickup, GoodsEntry::GES_PICKUP)) continue; SetDParam(0, cs->name); SetDParam(2, ToPercent8(ge->rating)); |