(svn r11016) -Fix [FS#1172]: stations would also be given cargo when vehicles have only dropped cargo of that particular type.
authorrubidium
Fri, 31 Aug 2007 17:09:13 +0000
changeset 7501 e4897cce1fac
parent 7500 e64b04e6f3b1
child 7502 f821f134ec5a
(svn r11016) -Fix [FS#1172]: stations would also be given cargo when vehicles have only dropped cargo of that particular type.
src/station_cmd.cpp
--- a/src/station_cmd.cpp	Fri Aug 31 13:06:28 2007 +0000
+++ b/src/station_cmd.cpp	Fri Aug 31 17:09:13 2007 +0000
@@ -2619,7 +2619,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 || 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) {