diff options
author | tron <tron@openttd.org> | 2004-12-05 12:43:04 +0000 |
---|---|---|
committer | tron <tron@openttd.org> | 2004-12-05 12:43:04 +0000 |
commit | 7c2448ecea6ec47f9df4928ad3f42668936835ee (patch) | |
tree | f4ed902f473744cc8497d09b3f372d3da1524f4f /oldloader.c | |
parent | 1de8e294d892a70edbd1f4f3d3a6a141711f6648 (diff) | |
download | openttd-7c2448ecea6ec47f9df4928ad3f42668936835ee.tar.xz |
(svn r955) Replace uint16 for orders with struct Order
This adds no functionality, but is a stepping stone for future improvement (like 16bit order indices) and is easier to read.
This changes preserves binary compatibility wrt savegames.
Diffstat (limited to 'oldloader.c')
-rw-r--r-- | oldloader.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/oldloader.c b/oldloader.c index 81f3ed9b3..32e8e0abe 100644 --- a/oldloader.c +++ b/oldloader.c @@ -736,8 +736,9 @@ static void FixVehicle(Vehicle *n, OldVehicle *o, int num) assert(n->schedule_ptr >= _order_array && n->schedule_ptr < _ptr_to_next_order); } - n->next_order = o->next_order; - n->next_order_param = o->next_order_param; + n->current_order.type = o->next_order & 0x0f; + n->current_order.flags = o->next_order >> 4; + n->current_order.station = o->next_order_param; n->num_orders = o->num_orders; n->cur_order_index = o->cur_order_index; n->dest_tile = o->dest_tile; |