diff options
author | bjarni <bjarni@openttd.org> | 2007-03-08 21:39:34 +0000 |
---|---|---|
committer | bjarni <bjarni@openttd.org> | 2007-03-08 21:39:34 +0000 |
commit | c2b7d0192d2b07ca7e4d87d583dabb2e43df49ec (patch) | |
tree | cfdbc180c9140ada4cb0bc22da9defe931609d16 /src/ship_cmd.cpp | |
parent | daeac3d310a6bf367eb77f0b965f8930dc187899 (diff) | |
download | openttd-c2b7d0192d2b07ca7e4d87d583dabb2e43df49ec.tar.xz |
(svn r9072) -Codechange: [Orders] added methods to orders to free them and check if they are in use
Diffstat (limited to 'src/ship_cmd.cpp')
-rw-r--r-- | src/ship_cmd.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/ship_cmd.cpp b/src/ship_cmd.cpp index 54c1b0cfa..6aa488138 100644 --- a/src/ship_cmd.cpp +++ b/src/ship_cmd.cpp @@ -264,8 +264,7 @@ static void ProcessShipOrder(Vehicle *v) order = GetVehicleOrder(v, v->cur_order_index); if (order == NULL) { - v->current_order.type = OT_NOTHING; - v->current_order.flags = 0; + v->current_order.Free(); v->dest_tile = 0; return; } @@ -705,8 +704,7 @@ static void ShipController(Vehicle *v) /* A leave station order only needs one tick to get processed, so we can * always skip ahead. */ if (v->current_order.type == OT_LEAVESTATION) { - v->current_order.type = OT_NOTHING; - v->current_order.flags = 0; + v->current_order.Free(); InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); } else if (v->dest_tile != 0) { /* We have a target, let's see if we reached it... */ |