From d9ee10d3b835e713a117df6f8ffae20e3bf3b27e Mon Sep 17 00:00:00 2001 From: Darkvater Date: Thu, 16 Mar 2006 00:20:33 +0000 Subject: (svn r3895) - Add proper SLE(G)_CONDNULL macros for the empty space reservation in savegames and update where used - Also add this capability to settings --- station_cmd.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'station_cmd.c') diff --git a/station_cmd.c b/station_cmd.c index 23b63091b..edb05f6d3 100644 --- a/station_cmd.c +++ b/station_cmd.c @@ -2816,7 +2816,7 @@ static const SaveLoad _roadstop_desc[] = { SLE_VAR(RoadStop,used, SLE_UINT8), SLE_VAR(RoadStop,status, SLE_UINT8), /* Index was saved in some versions, but this is not needed */ - SLE_CONDARR(NullStruct,null,SLE_FILE_U32 | SLE_VAR_NULL, 1, 0, 8), + SLE_CONDNULL(4, 0, 8), SLE_VAR(RoadStop,station, SLE_UINT16), SLE_VAR(RoadStop,type, SLE_UINT8), @@ -2844,7 +2844,7 @@ static const SaveLoad _station_desc[] = { SLE_CONDVAR(Station,trainst_h, SLE_UINT8, 2, SL_MAX_VERSION), // alpha_order was stored here in savegame format 0 - 3 - SLE_CONDARR(NullStruct,null,SLE_FILE_U8 | SLE_VAR_NULL, 1, 0, 3), + SLE_CONDNULL(1, 0, 3), SLE_VAR(Station,string_id, SLE_STRINGID), SLE_VAR(Station,had_vehicle_of_type,SLE_UINT16), @@ -2875,8 +2875,8 @@ static const SaveLoad _station_desc[] = { SLE_CONDREF(Station,bus_stops, REF_ROADSTOPS, 6, SL_MAX_VERSION), SLE_CONDREF(Station,truck_stops, REF_ROADSTOPS, 6, SL_MAX_VERSION), - // reserve extra space in savegame here. (currently 28 bytes) - SLE_CONDARR(NullStruct,null,SLE_FILE_U8 | SLE_VAR_NULL, 32, 2, SL_MAX_VERSION), + // reserve extra space in savegame here. (currently 32 bytes) + SLE_CONDNULL(32, 2, SL_MAX_VERSION), SLE_END() }; -- cgit v1.2.3-54-g00ecf