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

Merge branch 'more_cond_orders-sx' into jgrpp

Browse Source
This commit is contained in:
Jonathan G Rennison
2016-01-25 23:29:31 +00:00
parent c5f9d8b6de 19a43fe986
commit 10b679bba5
4 changed files with 70 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/order_cmd.cpp
View File

@@ -2183,7 +2183,7 @@ VehicleOrderID ProcessConditionalOrder(const Order *order, const Vehicle *v)
case OCV_UNCONDITIONALLY: skip_order = true; break;
case OCV_CARGO_WAITING: {
StationID next_station = GetNextRealStation(v, order);
if (Station::IsValidID(next_station)) skip_order = OrderConditionCompare(occ, !Station::Get(next_station)->goods[value].cargo.AvailableCount() > 0, value);
if (Station::IsValidID(next_station)) skip_order = OrderConditionCompare(occ, !(Station::Get(next_station)->goods[value].cargo.AvailableCount() > 0), value);
break;
}
case OCV_CARGO_ACCEPTANCE: {