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

Fix references to renamed variables.

Browse Source 
Update comment on Order::UpdateJumpCounter.
This commit is contained in:
Jonathan G Rennison
2015-08-26 23:07:02 +01:00
parent ffdd845b1c
commit 33233e8575
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/order_cmd.cpp
View File

@@ -125,7 +125,13 @@ void Order::MakeLoading(bool ordered)
} }
/** /**
* Makes this order a Leave Station order. * Update the jump counter, for percent probability
* conditional orders
*
* Not that jump_counter is signed and may become
* negative when a jump has been taken
*
* @return true if the jump should be taken
*/ */
bool Order::UpdateJumpCounter(byte percent) bool Order::UpdateJumpCounter(byte percent)
{ {
@@ -137,6 +143,9 @@ bool Order::UpdateJumpCounter(byte percent)
return false; return false;
} }
/**
* Makes this order a Leave Station order.
*/
void Order::MakeLeaveStation() void Order::MakeLeaveStation()
{ {
this->type = OT_LEAVESTATION; this->type = OT_LEAVESTATION;
@@ -2132,12 +2141,12 @@ 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.Empty(), 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: {
StationID next_station = GetNextRealStation(v, order); StationID next_station = GetNextRealStation(v, order);
if (Station::IsValidID(next_station)) skip_order = OrderConditionCompare(occ, HasBit(Station::Get(next_station)->goods[value].acceptance_pickup, GoodsEntry::GES_ACCEPTANCE), value); if (Station::IsValidID(next_station)) skip_order = OrderConditionCompare(occ, HasBit(Station::Get(next_station)->goods[value].status, GoodsEntry::GES_ACCEPTANCE), value);
break; break;
} }
case OCV_FREE_PLATFORMS: { case OCV_FREE_PLATFORMS: {