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

Fix assert fail when order set to no unload then unload, during unload

Browse Source
This commit is contained in:
Jonathan G Rennison
2022-11-07 18:27:35 +00:00
parent b428c5b58a
commit ce3eb338ba
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/economy.cpp
View File

@@ -2010,6 +2010,11 @@ static void LoadUnloadVehicle(Vehicle *front)
GoodsEntry *ge = &st->goods[v->cargo_type]; GoodsEntry *ge = &st->goods[v->cargo_type];
if (HasBit(v->vehicle_flags, VF_CARGO_UNLOADING) && payment == nullptr) {
/* Once the payment has been made, never attempt to unload again */
ClrBit(v->vehicle_flags, VF_CARGO_UNLOADING);
}
if (HasBit(v->vehicle_flags, VF_CARGO_UNLOADING) && (GetUnloadType(v) & OUFB_NO_UNLOAD) == 0) { if (HasBit(v->vehicle_flags, VF_CARGO_UNLOADING) && (GetUnloadType(v) & OUFB_NO_UNLOAD) == 0) {
uint cargo_count = v->cargo.UnloadCount(); uint cargo_count = v->cargo.UnloadCount();
uint amount_unloaded = _settings_game.order.gradual_loading ? std::min(cargo_count, GetLoadAmount(v)) : cargo_count; uint amount_unloaded = _settings_game.order.gradual_loading ? std::min(cargo_count, GetLoadAmount(v)) : cargo_count;
@@ -2074,9 +2079,6 @@ static void LoadUnloadVehicle(Vehicle *front)
} }
continue; continue;
} else if (HasBit(v->vehicle_flags, VF_CARGO_UNLOADING) && payment == nullptr) {
/* Once the payment has been made, never attempt to unload again */
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.