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

(svn r18615) -Fix: conditional orders were seen as 'valid' and as such aircraft with only conditional orders did not crash

release/1.0
rubidium 2009-12-23 18:43:38 +00:00
parent fbaba4e6bd
commit 277794e26b
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/order_cmd.cpp
View File

@ -1596,13 +1596,24 @@ uint16 GetServiceIntervalClamped(uint interval, CompanyID company_id)
* Check if a vehicle has any valid orders * Check if a vehicle has any valid orders
* *
* @return false if there are no valid orders * @return false if there are no valid orders
* @note Conditional orders are not considered valid destination orders
* *
*/ */
static bool CheckForValidOrders(const Vehicle *v) static bool CheckForValidOrders(const Vehicle *v)
{ {
const Order *order; const Order *order;
FOR_VEHICLE_ORDERS(v, order) if (!order->IsType(OT_DUMMY)) return true; FOR_VEHICLE_ORDERS(v, order) {
switch (order->GetType()) {
case OT_GOTO_STATION:
case OT_GOTO_DEPOT:
case OT_GOTO_WAYPOINT:
return true;
default:
break;
}
}
return false; return false;
} }
@ -1784,7 +1795,7 @@ bool ProcessOrders(Vehicle *v)
const Order *order = v->GetOrder(v->cur_order_index); const Order *order = v->GetOrder(v->cur_order_index);
/* If no order, do nothing. */ /* If no order, do nothing. */
if (order == NULL || (v->type == VEH_AIRCRAFT && order->IsType(OT_DUMMY) && !CheckForValidOrders(v))) { if (order == NULL || (v->type == VEH_AIRCRAFT && !CheckForValidOrders(v))) {
if (v->type == VEH_AIRCRAFT) { if (v->type == VEH_AIRCRAFT) {
/* Aircraft do something vastly different here, so handle separately */ /* Aircraft do something vastly different here, so handle separately */
extern void HandleMissingAircraftOrders(Aircraft *v); extern void HandleMissingAircraftOrders(Aircraft *v);