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

Fix order lookahead changing percent of times conditional order state

Browse Source
This commit is contained in:
Jonathan G Rennison
2020-08-21 17:06:51 +01:00
parent 37ee095f4a
commit 1e0005d7a0
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/order_base.h
View File

@@ -218,11 +218,12 @@ public:
/** /**
* Update the jump_counter of this order. * Update the jump_counter of this order.
* @param the jump chance in %. * @param percent the jump chance in %.
* @param dry_run whether this is a dry-run, so do not execute side-effects
* @return whether to jump or not. * @return whether to jump or not.
* @pre IsType(OT_CONDITIONAL) && this->GetConditionVariable() == OCV_PERCENT. * @pre IsType(OT_CONDITIONAL) && this->GetConditionVariable() == OCV_PERCENT.
*/ */
bool UpdateJumpCounter(uint8 percent); bool UpdateJumpCounter(uint8 percent, bool dry_run);
/** How must the consist be loaded? */ /** How must the consist be loaded? */
inline OrderLoadFlags GetLoadType() const inline OrderLoadFlags GetLoadType() const

8
src/order_cmd.cpp
View File

@@ -169,10 +169,14 @@ void Order::MakeLoading(bool ordered)
* Not that jump_counter is signed and may become * Not that jump_counter is signed and may become
* negative when a jump has been taken * negative when a jump has been taken
* *
* @param percent the jump chance in %.
* @param dry_run whether this is a dry-run, so do not execute side-effects
*
* @return true if the jump should be taken * @return true if the jump should be taken
*/ */
bool Order::UpdateJumpCounter(byte percent) bool Order::UpdateJumpCounter(byte percent, bool dry_run)
{ {
if (dry_run) return this->jump_counter >= 0;
if (this->jump_counter >= 0) { if (this->jump_counter >= 0) {
this->jump_counter += (percent - 100); this->jump_counter += (percent - 100);
return true; return true;
@@ -2690,7 +2694,7 @@ VehicleOrderID ProcessConditionalOrder(const Order *order, const Vehicle *v, boo
case OCV_PERCENT: { case OCV_PERCENT: {
/* get a non-const reference to the current order */ /* get a non-const reference to the current order */
Order *ord = const_cast<Order *>(order); Order *ord = const_cast<Order *>(order);
skip_order = ord->UpdateJumpCounter((byte)value); skip_order = ord->UpdateJumpCounter((byte)value, dry_run);
break; break;
} }
case OCV_REMAINING_LIFETIME: skip_order = OrderConditionCompare(occ, max(v->max_age - v->age + DAYS_IN_LEAP_YEAR - 1, 0) / DAYS_IN_LEAP_YEAR, value); break; case OCV_REMAINING_LIFETIME: skip_order = OrderConditionCompare(occ, max(v->max_age - v->age + DAYS_IN_LEAP_YEAR - 1, 0) / DAYS_IN_LEAP_YEAR, value); break;