mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r3585) Similar changes to the order handlers of the other vehicle types like r3584
This commit is contained in:
parent
784801f930
commit
f5b564bc44
|
@ -1043,19 +1043,17 @@ static void ProcessAircraftOrder(Vehicle *v)
|
|||
{
|
||||
const Order *order;
|
||||
|
||||
// OT_GOTO_DEPOT, OT_LOADING
|
||||
if (v->current_order.type == OT_GOTO_DEPOT ||
|
||||
v->current_order.type == OT_LOADING) {
|
||||
if (v->current_order.type != OT_GOTO_DEPOT ||
|
||||
!(v->current_order.flags & OF_UNLOAD))
|
||||
return;
|
||||
}
|
||||
switch (v->current_order.type) {
|
||||
case OT_GOTO_DEPOT:
|
||||
if (!(v->current_order.flags & OF_PART_OF_ORDERS)) return;
|
||||
if (v->current_order.flags & OF_SERVICE_IF_NEEDED &&
|
||||
!VehicleNeedsService(v)) {
|
||||
v->cur_order_index++;
|
||||
}
|
||||
break;
|
||||
|
||||
if (v->current_order.type == OT_GOTO_DEPOT &&
|
||||
(v->current_order.flags & (OF_PART_OF_ORDERS | OF_SERVICE_IF_NEEDED)) == (OF_PART_OF_ORDERS | OF_SERVICE_IF_NEEDED) &&
|
||||
!VehicleNeedsService(v)) {
|
||||
v->cur_order_index++;
|
||||
}
|
||||
case OT_LOADING: return;
|
||||
}
|
||||
|
||||
if (v->cur_order_index >= v->num_orders) v->cur_order_index = 0;
|
||||
|
||||
|
@ -1067,8 +1065,7 @@ static void ProcessAircraftOrder(Vehicle *v)
|
|||
return;
|
||||
}
|
||||
|
||||
if (order->type == OT_DUMMY && !CheckForValidOrders(v))
|
||||
CrashAirplane(v);
|
||||
if (order->type == OT_DUMMY && !CheckForValidOrders(v)) CrashAirplane(v);
|
||||
|
||||
if (order->type == v->current_order.type &&
|
||||
order->flags == v->current_order.flags &&
|
||||
|
|
25
ship_cmd.c
25
ship_cmd.c
|
@ -203,22 +203,21 @@ static void ProcessShipOrder(Vehicle *v)
|
|||
{
|
||||
const Order *order;
|
||||
|
||||
if (v->current_order.type >= OT_GOTO_DEPOT &&
|
||||
v->current_order.type <= OT_LEAVESTATION) {
|
||||
if (v->current_order.type != OT_GOTO_DEPOT ||
|
||||
!(v->current_order.flags & OF_UNLOAD))
|
||||
switch (v->current_order.type) {
|
||||
case OT_GOTO_DEPOT:
|
||||
if (!(v->current_order.flags & OF_PART_OF_ORDERS)) return;
|
||||
if (v->current_order.flags & OF_SERVICE_IF_NEEDED &&
|
||||
!VehicleNeedsService(v)) {
|
||||
v->cur_order_index++;
|
||||
}
|
||||
break;
|
||||
|
||||
case OT_LOADING:
|
||||
case OT_LEAVESTATION:
|
||||
return;
|
||||
}
|
||||
|
||||
if (v->current_order.type == OT_GOTO_DEPOT &&
|
||||
(v->current_order.flags & (OF_PART_OF_ORDERS | OF_SERVICE_IF_NEEDED)) == (OF_PART_OF_ORDERS | OF_SERVICE_IF_NEEDED) &&
|
||||
!VehicleNeedsService(v)) {
|
||||
v->cur_order_index++;
|
||||
}
|
||||
|
||||
|
||||
if (v->cur_order_index >= v->num_orders)
|
||||
v->cur_order_index = 0;
|
||||
if (v->cur_order_index >= v->num_orders) v->cur_order_index = 0;
|
||||
|
||||
order = GetVehicleOrder(v, v->cur_order_index);
|
||||
|
||||
|
|
23
train_cmd.c
23
train_cmd.c
|
@ -2274,19 +2274,18 @@ static bool ProcessTrainOrder(Vehicle *v)
|
|||
const Order *order;
|
||||
bool result;
|
||||
|
||||
// These are un-interruptible
|
||||
if (v->current_order.type >= OT_GOTO_DEPOT &&
|
||||
v->current_order.type <= OT_LEAVESTATION) {
|
||||
// Let a depot order in the orderlist interrupt.
|
||||
if (v->current_order.type != OT_GOTO_DEPOT ||
|
||||
!(v->current_order.flags & OF_UNLOAD))
|
||||
return false;
|
||||
}
|
||||
switch (v->current_order.type) {
|
||||
case OT_GOTO_DEPOT:
|
||||
if (!(v->current_order.flags & OF_PART_OF_ORDERS)) return false;
|
||||
if ((v->current_order.flags & OF_SERVICE_IF_NEEDED) &&
|
||||
!VehicleNeedsService(v)) {
|
||||
v->cur_order_index++;
|
||||
}
|
||||
break;
|
||||
|
||||
if (v->current_order.type == OT_GOTO_DEPOT &&
|
||||
(v->current_order.flags & (OF_PART_OF_ORDERS | OF_SERVICE_IF_NEEDED)) == (OF_PART_OF_ORDERS | OF_SERVICE_IF_NEEDED) &&
|
||||
!VehicleNeedsService(v)) {
|
||||
v->cur_order_index++;
|
||||
case OT_LOADING:
|
||||
case OT_LEAVESTATION:
|
||||
return false;
|
||||
}
|
||||
|
||||
// check if we've reached the waypoint?
|
||||
|
|
Loading…
Reference in New Issue