mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r21934) -Fix (r21933): The original plan was to run the regression before committing.

release/1.1
frosch 2011-01-31 20:56:02 +00:00
parent a97d52a29a
commit 49ea0e9092
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/order_cmd.cpp
View File

@ -1860,7 +1860,7 @@ bool UpdateOrderDest(Vehicle *v, const Order *order, int conditional_depth)
/* Get the current order */ /* Get the current order */
order = v->GetOrder(v->cur_real_order_index); order = v->GetOrder(v->cur_real_order_index);
if (order->IsType(OT_AUTOMATIC)) { if (order != NULL && order->IsType(OT_AUTOMATIC)) {
assert(v->GetNumManualOrders() == 0); assert(v->GetNumManualOrders() == 0);
order = NULL; order = NULL;
} }
@ -1927,7 +1927,7 @@ bool ProcessOrders(Vehicle *v)
v->UpdateRealOrderIndex(); v->UpdateRealOrderIndex();
const Order *order = v->GetOrder(v->cur_real_order_index); const Order *order = v->GetOrder(v->cur_real_order_index);
if (order->IsType(OT_AUTOMATIC)) { if (order != NULL && order->IsType(OT_AUTOMATIC)) {
assert(v->GetNumManualOrders() == 0); assert(v->GetNumManualOrders() == 0);
order = NULL; order = NULL;
} }