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

Fix crash in distributing residual cargo in MoveGoodsToStation

Browse Source
This commit is contained in:
Jonathan G Rennison
2020-02-21 08:18:14 +00:00
parent f08032f6ef
commit 70794644cc
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/station_cmd.cpp
View File

@@ -4349,9 +4349,12 @@ uint MoveGoodsToStation(CargoID type, uint amount, SourceType source_type, Sourc
return b.first->goods[type].rating < a.first->goods[type].rating; return b.first->goods[type].rating < a.first->goods[type].rating;
}); });
assert(amount - moving <= used_stations.size()); uint to_deliver = amount - moving;
for (uint i = 0; i < amount - moving; i++) { uint step_size = CeilDivT<uint>(to_deliver, used_stations.size());
used_stations[i].second++; for (uint i = 0; i < used_stations.size() && to_deliver > 0; i++) {
uint delivery = min<uint>(to_deliver, step_size);
used_stations[i].second += delivery;
to_deliver -= delivery;
} }
} }