Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-16 00:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r24944) -Fix [FS#5452]: Deleting implicit orders wasn't able to deal with the various side-effects of DeleteOrder.

Browse Source
This commit is contained in:
frosch 2013-01-27 18:11:16 +00:00
parent 7260623df3
commit ddfd734523
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/vehicle.cpp
View File

@ -1850,9 +1850,9 @@ void Vehicle::DeleteUnreachedImplicitOrders()
if (this->cur_implicit_order_index == this->cur_real_order_index) break; if (this->cur_implicit_order_index == this->cur_real_order_index) break;
if (order->IsType(OT_IMPLICIT)) { if (order->IsType(OT_IMPLICIT)) {
/* Delete order effectively deletes order, so get the next before deleting it. */
order = order->next;
DeleteOrder(this, this->cur_implicit_order_index); DeleteOrder(this, this->cur_implicit_order_index);
/* DeleteOrder does various magic with order_indices, so resync 'order' with 'cur_implicit_order_index' */
order = this->GetOrder(this->cur_implicit_order_index);
} else { } else {
/* Skip non-implicit orders, e.g. service-orders */ /* Skip non-implicit orders, e.g. service-orders */
order = order->next; order = order->next;
@ -1932,9 +1932,9 @@ void Vehicle::BeginLoading()
const Order *order = this->GetOrder(this->cur_implicit_order_index); const Order *order = this->GetOrder(this->cur_implicit_order_index);
while (!order->IsType(OT_IMPLICIT) || order->GetDestination() != this->last_station_visited) { while (!order->IsType(OT_IMPLICIT) || order->GetDestination() != this->last_station_visited) {
if (order->IsType(OT_IMPLICIT)) { if (order->IsType(OT_IMPLICIT)) {
/* Delete order effectively deletes order, so get the next before deleting it. */
order = order->next;
DeleteOrder(this, this->cur_implicit_order_index); DeleteOrder(this, this->cur_implicit_order_index);
/* DeleteOrder does various magic with order_indices, so resync 'order' with 'cur_implicit_order_index' */
order = this->GetOrder(this->cur_implicit_order_index);
} else { } else {
/* Skip non-implicit orders, e.g. service-orders */ /* Skip non-implicit orders, e.g. service-orders */
order = order->next; order = order->next;