Merge branch 'more_cond_orders' into more_cond_orders-sx

pull/11/head
Jonathan G Rennison 8 years ago
commit 03f3ba157b

@ -2141,7 +2141,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: {

Loading…
Cancel
Save