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

Merge branch 'cargo_type_order' into jgrpp

Browse Source
This commit is contained in:
Jonathan G Rennison
2020-05-27 20:44:58 +01:00
parent 2e93ca9409 78ef36ec6a
commit 8d454cd006
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/economy.cpp
View File

@@ -1920,8 +1920,9 @@ static void LoadUnloadVehicle(Vehicle *front)
ClrBit(v->vehicle_flags, VF_CARGO_UNLOADING); ClrBit(v->vehicle_flags, VF_CARGO_UNLOADING);
} }
/* Do not pick up goods when we have no-load set or loading is stopped. */ /* Do not pick up goods when we have no-load set or loading is stopped.
if (GetLoadType(v) & OLFB_NO_LOAD || HasBit(front->vehicle_flags, VF_STOP_LOADING)) continue; * Per-cargo no-load orders can only be checked after attempting to refit. */
if (front->current_order.GetLoadType() & OLFB_NO_LOAD || HasBit(front->vehicle_flags, VF_STOP_LOADING)) continue;
/* This order has a refit, if this is the first vehicle part carrying cargo and the whole vehicle is empty, try refitting. */ /* This order has a refit, if this is the first vehicle part carrying cargo and the whole vehicle is empty, try refitting. */
if (front->current_order.IsRefit() && artic_part == 1) { if (front->current_order.IsRefit() && artic_part == 1) {
@@ -1929,6 +1930,9 @@ static void LoadUnloadVehicle(Vehicle *front)
ge = &st->goods[v->cargo_type]; ge = &st->goods[v->cargo_type];
} }
/* Do not pick up goods when we have no-load set. */
if (GetLoadType(v) & OLFB_NO_LOAD) continue;
/* As we're loading here the following link can carry the full capacity of the vehicle. */ /* As we're loading here the following link can carry the full capacity of the vehicle. */
v->refit_cap = v->cargo_cap; v->refit_cap = v->cargo_cap;