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

Fix handling of current timetable order index when deleting/inserting orders

Browse Source
This commit is contained in:
Jonathan G Rennison
2017-12-18 23:19:50 +00:00
parent c4897f92df
commit 9a5986fa70
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/order_cmd.cpp
View File

@@ -1129,7 +1129,7 @@ void InsertOrder(Vehicle *v, Order *new_o, VehicleOrderID sel_ord)
u->cur_implicit_order_index = cur; u->cur_implicit_order_index = cur;
} }
} }
if (sel_ord <= u->cur_timetable_order_index) { if (u->cur_timetable_order_index != INVALID_VEH_ORDER_ID && sel_ord <= u->cur_timetable_order_index) {
uint cur = u->cur_timetable_order_index + 1; uint cur = u->cur_timetable_order_index + 1;
/* Check if we don't go out of bound */ /* Check if we don't go out of bound */
if (cur < u->GetNumOrders()) { if (cur < u->GetNumOrders()) {
@@ -1278,10 +1278,12 @@ void DeleteOrder(Vehicle *v, VehicleOrderID sel_ord)
} }
} }
if (sel_ord < u->cur_timetable_order_index) { if (u->cur_timetable_order_index != INVALID_VEH_ORDER_ID) {
u->cur_timetable_order_index--; if (sel_ord < u->cur_timetable_order_index) {
} else if (sel_ord == u->cur_timetable_order_index) { u->cur_timetable_order_index--;
u->cur_timetable_order_index = INVALID_VEH_ORDER_ID; } else if (sel_ord == u->cur_timetable_order_index) {
u->cur_timetable_order_index = INVALID_VEH_ORDER_ID;
}
} }
/* Update any possible open window of the vehicle */ /* Update any possible open window of the vehicle */