diff options
author | truelight <truelight@openttd.org> | 2006-08-26 14:22:54 +0000 |
---|---|---|
committer | truelight <truelight@openttd.org> | 2006-08-26 14:22:54 +0000 |
commit | 602c0d40b38c83e520667ec1585b7745278fbbf8 (patch) | |
tree | 3ffa0a94034a5993e48411c7cb9b2cb765c6b1de /order_cmd.c | |
parent | be737b80d35aebf98a7fb571b1124cd51b371953 (diff) | |
download | openttd-602c0d40b38c83e520667ec1585b7745278fbbf8.tar.xz |
(svn r6137) -Codechange: some very minor cleanups:
- Start using DeleteXXX for every pool item, not manually doing it
- Use some wrapper to improve logic
- Rewrote some pieces to improve logic
Diffstat (limited to 'order_cmd.c')
-rw-r--r-- | order_cmd.c | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/order_cmd.c b/order_cmd.c index 3cca2aa0f..f2b1924b9 100644 --- a/order_cmd.c +++ b/order_cmd.c @@ -1028,7 +1028,7 @@ bool VehicleHasDepotOrders(const Vehicle *v) */ void DeleteVehicleOrders(Vehicle *v) { - Order *order, *cur; + Order *cur, *next; DeleteOrderWarnings(v); @@ -1066,20 +1066,10 @@ void DeleteVehicleOrders(Vehicle *v) v->orders = NULL; v->num_orders = 0; - order = NULL; - while (cur != NULL) { - if (order != NULL) { - order->type = OT_NOTHING; - order->next = NULL; - } - - order = cur; - cur = cur->next; - } - - if (order != NULL) { - order->type = OT_NOTHING; - order->next = NULL; + while (cur != NULL) { + next = cur->next; + DeleteOrder(cur); + cur = next; } } |