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

Merge branch 'jgrpp' into jgrpp-nrt

Browse Source
This commit is contained in:
Jonathan G Rennison
2019-07-13 20:35:17 +01:00
parent d3e0c3787f 8b1fb60dea
commit 1365600bed
8 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/saveload/afterload.cpp
View File

@@ -3496,7 +3496,9 @@ bool AfterLoadGame()
/* convert wait for cargo orders to ordinary load if possible */
Order *order;
FOR_ALL_ORDERS(order) {
if (order->GetLoadType() == static_cast<OrderLoadFlags>(1)) order->SetLoadType(OLF_LOAD_IF_POSSIBLE);
if ((order->IsType(OT_GOTO_STATION) || order->IsType(OT_LOADING) || order->IsType(OT_IMPLICIT)) && order->GetLoadType() == static_cast<OrderLoadFlags>(1)) {
order->SetLoadType(OLF_LOAD_IF_POSSIBLE);
}
}
}