diff options
| author | rubidium <rubidium@openttd.org> | 2007-08-31 17:09:13 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2007-08-31 17:09:13 +0000 |
| commit | 976ce8ad3f16f2e1f38672eae3eeb6700a920f72 (patch) | |
| tree | 7a59be45a9fcca61dc32539e7b30986374ac3685 /src/station_cmd.cpp | |
| parent | c81eafdaa023d2957b2351c9cbaec64b86fda079 (diff) | |
| download | openttd-976ce8ad3f16f2e1f38672eae3eeb6700a920f72.tar.xz | |
(svn r11016) -Fix [FS#1172]: stations would also be given cargo when vehicles have only dropped cargo of that particular type.
Diffstat (limited to 'src/station_cmd.cpp')
| -rw-r--r-- | src/station_cmd.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp index 06a41a24c..fd2442ef2 100644 --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -2619,7 +2619,7 @@ uint MoveGoodsToStation(TileIndex tile, int w, int h, CargoID type, uint amount) 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 || st->goods[type].last_speed > 0) && // we are servicing the station (or cargo is dumped on all stations) + (!_patches.selectgoods || HASBIT(st->goods[type].acceptance_pickup, GoodsEntry::PICKUP)) && // 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) { |