dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r11030) -Revert r11016, Fix [FS#1178]: the way to determine whether a station should get goods was not done properly.

Browse Source
This commit is contained in:
rubidium
2007-09-01 08:04:08 +00:00
parent dc4c52a313
commit 766d6d420e
4 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/station_cmd.cpp
View File

@@ -2532,6 +2532,7 @@ void ModifyStationRatingAround(TileIndex tile, PlayerID owner, int amount, uint
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 @@ 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 || 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) {