diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/economy.cpp | 2 | ||||
| -rw-r--r-- | src/station_cmd.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/economy.cpp b/src/economy.cpp index e0e4269d5..e92125146 100644 --- a/src/economy.cpp +++ b/src/economy.cpp @@ -1556,7 +1556,6 @@ static void LoadUnloadVehicle(Vehicle *v, int *cargo_left) } /* if last speed is 0, we treat that as if no vehicle has ever visited the station. */ - ge->days_since_pickup = 0; ge->last_speed = min(t, 255); ge->last_age = _cur_year - u->build_year; @@ -1594,6 +1593,7 @@ static void LoadUnloadVehicle(Vehicle *v, int *cargo_left) anything_loaded = true; ge->cargo.MoveTo(&v->cargo, cap, CargoList::MTA_CARGO_LOAD, st->xy); + ge->days_since_pickup = 0; unloading_time += cap; st->time_since_load = 0; diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp index c26e218d1..514cf4185 100644 --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -2544,7 +2544,7 @@ uint MoveGoodsToStation(TileIndex tile, int w, int h, CargoID type, uint amount) if (around[i] == NULL) { if (!st->IsBuoy() && (st->town->exclusive_counter == 0 || st->town->exclusivity == st->owner) && // check exclusive transport rights - st->goods[type].rating != 0 && st->goods[type].days_since_pickup != 255 && // we actually service the station + st->goods[type].rating != 0 && st->goods[type].last_speed != 0 && // we actually service the station (!_patches.selectgoods || st->goods[type].last_speed > 0) && // if last_speed is 0, no vehicle has been there. ((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 |