dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r9072) -Codechange: [Orders] added methods to orders to free them and check if they are in use

Browse Source
This commit is contained in:
bjarni
2007-03-08 21:39:34 +00:00
parent daeac3d310
commit c2b7d0192d
9 changed files with 46 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ship_cmd.cpp
View File

@@ -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... */