diff options
| author | rubidium <rubidium@openttd.org> | 2007-08-26 13:55:36 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2007-08-26 13:55:36 +0000 |
| commit | d5bc4d8b2af357567792d22c16f9591115dae389 (patch) | |
| tree | a1ad1c541e93eb8285d8b94ff26ffc3a974a4489 /src/station_gui.cpp | |
| parent | 182283a67ce4c28cc47c9b978f8c9b9075538ef4 (diff) | |
| download | openttd-d5bc4d8b2af357567792d22c16f9591115dae389.tar.xz | |
(svn r10981) -Fix [FS#1156] (r10970): stations gave ratings for accepted cargo too.
Diffstat (limited to 'src/station_gui.cpp')
| -rw-r--r-- | src/station_gui.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/station_gui.cpp b/src/station_gui.cpp index 00f24ed36..735725fa7 100644 --- a/src/station_gui.cpp +++ b/src/station_gui.cpp @@ -157,8 +157,8 @@ static int CDECL StationRatingMaxSorter(const void *a, const void *b) byte maxr2 = 0; for (CargoID j = 0; j < NUM_CARGO; j++) { - if (st1->goods[j].days_since_pickup != 255) maxr1 = max(maxr1, st1->goods[j].rating); - if (st2->goods[j].days_since_pickup != 255) maxr2 = max(maxr2, st2->goods[j].rating); + if (HASBIT(st1->goods[j].acceptance_pickup, GoodsEntry::PICKUP)) maxr1 = max(maxr1, st1->goods[j].rating); + if (HASBIT(st2->goods[j].acceptance_pickup, GoodsEntry::PICKUP)) maxr2 = max(maxr2, st2->goods[j].rating); } return (_internal_sort_order & 1) ? maxr2 - maxr1 : maxr1 - maxr2; @@ -771,7 +771,7 @@ static void DrawStationViewWindow(Window *w) for (CargoID i = 0; i < NUM_CARGO; i++) { if (b >= endof(_userstring) - 5 - 1) break; - if (st->goods[i].acceptance) { + if (HASBIT(st->goods[i].acceptance_pickup, GoodsEntry::ACCEPTANCE)) { if (first) { first = false; } else { @@ -797,7 +797,7 @@ static void DrawStationViewWindow(Window *w) if (!cs->IsValid()) continue; const GoodsEntry *ge = &st->goods[i]; - if (ge->days_since_pickup == 255) continue; + if (!HASBIT(ge->acceptance_pickup, GoodsEntry::PICKUP)) continue; SetDParam(0, cs->name); SetDParam(2, ge->rating * 101 >> 8); |