diff options
| author | truelight <truelight@openttd.org> | 2005-01-15 19:06:22 +0000 |
|---|---|---|
| committer | truelight <truelight@openttd.org> | 2005-01-15 19:06:22 +0000 |
| commit | d275109e79c191dde34b71f07e5a39cfeb11fba7 (patch) | |
| tree | 86e7a6e69dee1414ae1e88cfceffd93f1b28ded2 /saveload.c | |
| parent | 732c362deaaa9b6a817a2e82c45d88e33f8f1e90 (diff) | |
| download | openttd-d275109e79c191dde34b71f07e5a39cfeb11fba7.tar.xz | |
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
-Codechange: renamed all 'schedule' stuff to 'order(list)'
-Codechange: moved all order-stuff to order_cmd.c / order.h
-Codechange: vehicles that share orders are now linked to eachother
with next_shared/prev_shared in Vehicle
Developers: please use AssignOrder to assign data to an order. If not,
you _WILL_ make the save-routine to assert!
Diffstat (limited to 'saveload.c')
| -rw-r--r-- | saveload.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/saveload.c b/saveload.c index bfba0ff7b..4d44f4d3d 100644 --- a/saveload.c +++ b/saveload.c @@ -8,7 +8,7 @@ enum { SAVEGAME_MAJOR_VERSION = 5, - SAVEGAME_MINOR_VERSION = 1, + SAVEGAME_MINOR_VERSION = 2, SAVEGAME_LOADABLE_VERSION = (SAVEGAME_MAJOR_VERSION << 8) + SAVEGAME_MINOR_VERSION }; @@ -869,6 +869,7 @@ static void UninitWriteZlib() extern const ChunkHandler _misc_chunk_handlers[]; extern const ChunkHandler _player_chunk_handlers[]; extern const ChunkHandler _veh_chunk_handlers[]; +extern const ChunkHandler _order_chunk_handlers[]; extern const ChunkHandler _town_chunk_handlers[]; extern const ChunkHandler _sign_chunk_handlers[]; extern const ChunkHandler _station_chunk_handlers[]; @@ -880,6 +881,7 @@ extern const ChunkHandler _animated_tile_chunk_handlers[]; static const ChunkHandler * const _chunk_handlers[] = { _misc_chunk_handlers, _veh_chunk_handlers, + _order_chunk_handlers, _industry_chunk_handlers, _economy_chunk_handlers, _engine_chunk_handlers, @@ -912,9 +914,7 @@ static uint ReferenceToInt(void *v, uint t) case REF_VEHICLE: return ((Vehicle *)v)->index + 1; case REF_STATION: return ((Station *)v)->index + 1; case REF_TOWN: return ((Town *)v)->index + 1; - - case REF_SCHEDULE: - return ((byte*)v - (byte*)_order_array) / sizeof(_order_array[0]) + 1; + case REF_ORDER: return ((Order *)v)->index + 1; default: NOT_REACHED(); @@ -935,13 +935,11 @@ void *IntToReference(uint r, uint t) return NULL; switch (t) { + case REF_ORDER: return GetOrder(r - 1); case REF_VEHICLE: return GetVehicle(r - 1); case REF_STATION: return GetStation(r - 1); case REF_TOWN: return GetTown(r - 1); - case REF_SCHEDULE: - return (byte*)_order_array + (r - 1) * sizeof(_order_array[0]); - case REF_VEHICLE_OLD: { /* Old vehicles were saved differently: invalid vehicle was 0xFFFF, and the index was not - 1.. correct for this */ |