summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2007-05-05 09:51:26 +0000
committerrubidium <rubidium@openttd.org>2007-05-05 09:51:26 +0000
commit438d55d5768b352aadb95ee526fb5a5f070a7775 (patch)
tree720c47916e52622dfd3c43ec9a57d2c21d0ae3b1
parent79637ef7b8351ee7cfb7ee0f05213d78b7c4b542 (diff)
downloadopenttd-438d55d5768b352aadb95ee526fb5a5f070a7775.tar.xz
(svn r9789) -Fix (r9770): vehicles didn't get unloaded when 'full load' was specified and the vehicle was already full when it entered.
-rw-r--r--src/vehicle.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/vehicle.cpp b/src/vehicle.cpp
index 0722855fe..60896198c 100644
--- a/src/vehicle.cpp
+++ b/src/vehicle.cpp
@@ -704,7 +704,6 @@ void CallVehicleTicks()
static bool CanFillVehicle_FullLoadAny(Vehicle *v)
{
uint32 full = 0, not_full = 0;
- bool keep_loading = false;
const GoodsEntry *ge = GetStation(v->last_station_visited)->goods;
/* special handling of aircraft */
@@ -725,13 +724,13 @@ static bool CanFillVehicle_FullLoadAny(Vehicle *v)
if (v->cargo_cap != 0) {
uint32 mask = 1 << v->cargo_type;
- if (v->cargo_cap == v->cargo_count) {
+ if (!HASBIT(v->vehicle_flags, VF_CARGO_UNLOADING) && v->cargo_cap == v->cargo_count) {
full |= mask;
} else if (GB(ge[v->cargo_type].waiting_acceptance, 0, 12) > 0 ||
(HASBIT(v->vehicle_flags, VF_CARGO_UNLOADING) && (ge[v->cargo_type].waiting_acceptance & 0x8000))) {
/* If there is any cargo waiting, or this vehicle is still unloading
* and the station accepts the cargo, don't leave the station. */
- keep_loading = true;
+ return true;
} else {
not_full |= mask;
}
@@ -739,7 +738,7 @@ static bool CanFillVehicle_FullLoadAny(Vehicle *v)
} while ((v = v->next) != NULL);
/* continue loading if there is a non full cargo type and no cargo type that is full */
- return keep_loading || (not_full && (full & ~not_full) == 0);
+ return not_full && (full & ~not_full) == 0;
}