Mercurial > hg > openttd
diff src/station_cmd.cpp @ 7515:47b4eb921138 draft
(svn r11030) -Revert r11016, Fix [FS#1178]: the way to determine whether a station should get goods was not done properly.
| author | rubidium <rubidium@openttd.org> |
|---|---|
| date | Sat, 01 Sep 2007 08:04:08 +0000 |
| parents | a99f8ea26c2a |
| children | 2695ac2e8baa |
line wrap: on
line diff
--- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -2532,6 +2532,7 @@ static void UpdateStationWaiting(Station *st, CargoID type, uint amount) { st->goods[type].cargo.Append(new CargoPacket(st->index, amount)); + SETBIT(st->goods[type].acceptance_pickup, GoodsEntry::PICKUP); InvalidateWindow(WC_STATION_VIEW, st->index); st->MarkTilesDirty(true); @@ -2619,7 +2620,7 @@ if (!st->IsBuoy() && (st->town->exclusive_counter == 0 || st->town->exclusivity == st->owner) && // check exclusive transport rights st->goods[type].rating != 0 && // when you've got the lowest rating you can get, it's better not to give cargo anymore - (!_patches.selectgoods || HASBIT(st->goods[type].acceptance_pickup, GoodsEntry::PICKUP)) && // we are servicing the station (or cargo is dumped on all stations) + (!_patches.selectgoods || st->goods[type].last_speed != 0) && // we are servicing the station (or cargo is dumped on all stations) ((st->facilities & ~FACIL_BUS_STOP) != 0 || IsCargoInClass(type, CC_PASSENGERS)) && // if we have other fac. than a bus stop, or the cargo is passengers ((st->facilities & ~FACIL_TRUCK_STOP) != 0 || !IsCargoInClass(type, CC_PASSENGERS))) { // if we have other fac. than a cargo bay or the cargo is not passengers if (_patches.modified_catchment) {