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

Merge branch 'more_cond_orders' into more_cond_orders-sx

Browse Source
This commit is contained in:
Jonathan G Rennison
2017-01-20 20:08:05 +00:00
parent 19a43fe986 15e4174332
commit 03f3ba157b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/order_cmd.cpp
View File

@@ -2141,7 +2141,7 @@ VehicleOrderID ProcessConditionalOrder(const Order *order, const Vehicle *v)
case OCV_UNCONDITIONALLY: skip_order = true; break; case OCV_UNCONDITIONALLY: skip_order = true; break;
case OCV_CARGO_WAITING: { case OCV_CARGO_WAITING: {
StationID next_station = GetNextRealStation(v, order); 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; break;
} }
case OCV_CARGO_ACCEPTANCE: { case OCV_CARGO_ACCEPTANCE: {