mirrors/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD synced 2026-01-16 08:52:40 +01:00
Code Issues Releases Wiki Activity

Fix #14945: Hang when deleting implicit orders during vehicle loading. (#14946)

Browse Source
This commit is contained in:
Peter Nelson
2025-12-21 15:08:13 +00:00
committed by GitHub
parent 75f1c36eff
commit c6679bbcab
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/vehicle.cpp
View File

@@ -2248,22 +2248,22 @@ void Vehicle::BeginLoading()
InvalidateVehicleOrder(this, 0);
} else {
/* Delete all implicit orders up to the station we just reached */
VehicleOrderID cur = this->cur_implicit_order_index;
auto orders = this->Orders();
while (!orders[cur].IsType(OT_IMPLICIT) || orders[cur].GetDestination() != this->last_station_visited) {
if (orders[cur].IsType(OT_IMPLICIT)) {
const Order *order = this->GetOrder(this->cur_implicit_order_index);
while (!order->IsType(OT_IMPLICIT) || order->GetDestination() != this->last_station_visited) {
if (order->IsType(OT_IMPLICIT)) {
DeleteOrder(this, this->cur_implicit_order_index);
/* DeleteOrder does various magic with order_indices, so resync 'order' with 'cur_implicit_order_index' */
} else {
/* Skip non-implicit orders, e.g. service-orders */
if (cur < this->orders->GetNext(cur)) {
this->cur_implicit_order_index++;
} else {
/* Wrapped around. */
this->cur_implicit_order_index = 0;
}
cur = this->orders->GetNext(cur);
++this->cur_implicit_order_index;
}
order = this->GetOrder(this->cur_implicit_order_index);
/* Wrapped around. */
if (order == nullptr) {
this->cur_implicit_order_index = 0;
order = this->GetOrder(this->cur_implicit_order_index);
}
assert(order != nullptr);
}
}
} else if (!suppress_implicit_orders &&