summaryrefslogtreecommitdiff
path: root/vehicle.c
diff options
context:
space:
mode:
authorpeter1138 <peter1138@openttd.org>2006-12-02 16:56:32 +0000
committerpeter1138 <peter1138@openttd.org>2006-12-02 16:56:32 +0000
commit039794e83ca40717e0a5aff927f20e7a560ac7c5 (patch)
tree5e7abf3b12a62b206a4e2ea934e86e51e08cb91e /vehicle.c
parent6a4d8fdd33de84ef691caa29ea77c21ff2b8d6c4 (diff)
downloadopenttd-039794e83ca40717e0a5aff927f20e7a560ac7c5.tar.xz
(svn r7326) -Feature: Add support for gradual (un)loading of vehicles (Maedhros)
Diffstat (limited to 'vehicle.c')
-rw-r--r--vehicle.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/vehicle.c b/vehicle.c
index 8d202c8d1..8cb22c7cf 100644
--- a/vehicle.c
+++ b/vehicle.c
@@ -725,7 +725,7 @@ bool CanFillVehicle(Vehicle *v)
))) {
// If patch is active, use alternative CanFillVehicle-function
- if (_patches.full_load_any) return CanFillVehicle_FullLoadAny(v);
+ if (_patches.full_load_any && v->current_order.flags & OF_FULL_LOAD) return CanFillVehicle_FullLoadAny(v);
do {
if (v->cargo_count != v->cargo_cap) return true;
@@ -2987,6 +2987,7 @@ const SaveLoad _common_veh_desc[] = {
SLE_CONDVAR(Vehicle, build_year, SLE_INT32, 31, SL_MAX_VERSION),
SLE_VAR(Vehicle, load_unload_time_rem, SLE_UINT16),
+ SLE_CONDVAR(Vehicle, load_status, SLE_UINT8, 40, SL_MAX_VERSION),
SLE_VAR(Vehicle, profit_this_year, SLE_INT32),
SLE_VAR(Vehicle, profit_last_year, SLE_INT32),