diff options
Diffstat (limited to 'src/ship_cmd.cpp')
| -rw-r--r-- | src/ship_cmd.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/ship_cmd.cpp b/src/ship_cmd.cpp index eb41ffdc0..92af6e5ec 100644 --- a/src/ship_cmd.cpp +++ b/src/ship_cmd.cpp @@ -164,7 +164,7 @@ static void CheckIfShipNeedsService(Vehicle *v) } v->current_order.type = OT_GOTO_DEPOT; - v->current_order.flags = OF_NON_STOP; + v->current_order.flags = OFB_NON_STOP; v->current_order.dest = depot->index; v->dest_tile = depot->xy; InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); @@ -250,8 +250,8 @@ static void ProcessShipOrder(Vehicle *v) 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 && + if (!(v->current_order.flags & OFB_PART_OF_ORDERS)) return; + if (v->current_order.flags & OFB_SERVICE_IF_NEEDED && !VehicleNeedsService(v)) { UpdateVehicleTimetable(v, true); v->cur_order_index++; @@ -1000,13 +1000,13 @@ CommandCost CmdSendShipToDepot(TileIndex tile, uint32 flags, uint32 p1, uint32 p /* If the current orders are already goto-depot */ if (v->current_order.type == OT_GOTO_DEPOT) { - if (!!(p2 & DEPOT_SERVICE) == HasBit(v->current_order.flags, OFB_HALT_IN_DEPOT)) { + if (!!(p2 & DEPOT_SERVICE) == HasBit(v->current_order.flags, OF_HALT_IN_DEPOT)) { /* We called with a different DEPOT_SERVICE setting. * Now we change the setting to apply the new one and let the vehicle head for the same depot. * Note: the if is (true for requesting service == true for ordered to stop in depot) */ if (flags & DC_EXEC) { - ClrBit(v->current_order.flags, OFB_PART_OF_ORDERS); - ToggleBit(v->current_order.flags, OFB_HALT_IN_DEPOT); + ClrBit(v->current_order.flags, OF_PART_OF_ORDERS); + ToggleBit(v->current_order.flags, OF_HALT_IN_DEPOT); InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); } return CommandCost(); @@ -1016,7 +1016,7 @@ CommandCost CmdSendShipToDepot(TileIndex tile, uint32 flags, uint32 p1, uint32 p if (flags & DC_EXEC) { /* If the orders to 'goto depot' are in the orders list (forced servicing), * then skip to the next order; effectively cancelling this forced service */ - if (HasBit(v->current_order.flags, OFB_PART_OF_ORDERS)) + if (HasBit(v->current_order.flags, OF_PART_OF_ORDERS)) v->cur_order_index++; v->current_order.type = OT_DUMMY; @@ -1034,8 +1034,8 @@ CommandCost CmdSendShipToDepot(TileIndex tile, uint32 flags, uint32 p1, uint32 p v->dest_tile = dep->xy; v->current_order.type = OT_GOTO_DEPOT; - v->current_order.flags = OF_NON_STOP; - if (!(p2 & DEPOT_SERVICE)) SetBit(v->current_order.flags, OFB_HALT_IN_DEPOT); + v->current_order.flags = OFB_NON_STOP; + if (!(p2 & DEPOT_SERVICE)) SetBit(v->current_order.flags, OF_HALT_IN_DEPOT); v->current_order.refit_cargo = CT_INVALID; v->current_order.dest = dep->index; InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); |