# HG changeset patch # User Darkvater # Date 1138574451 0 # Node ID d503d725d7d4b93045ce0f1cac9ab3176ce3c6a0 # Parent 0fea187a09f55b46ab3c6bdfeabdc2fba16adef5 (svn r3482) - Fix: since multiheaded links are not saved anymore do NOT save them anymore at all, return the extra space. Since Bjarni's fix for this was abominable, the weird situation arises of 2 NULL structs of free space, of which the first isn't usable. diff -r 0fea187a09f5 -r d503d725d7d4 vehicle.c --- a/vehicle.c Sun Jan 29 21:38:24 2006 +0000 +++ b/vehicle.c Sun Jan 29 22:40:51 2006 +0000 @@ -2122,12 +2122,9 @@ SLE_CONDVARX(offsetof(Vehicle,u)+offsetof(VehicleRail,flags), SLE_UINT8, 2, 255), SLE_CONDVARX(offsetof(Vehicle,u)+offsetof(VehicleRail,days_since_order_progr), SLE_UINT16, 2, 255), - // reserve extra space in savegame here. (currently 8 bytes) - SLE_CONDARR(NullStruct, null, SLE_FILE_U8 | SLE_VAR_NULL, 8, 2, 255), - - SLE_CONDREFX(offsetof(Vehicle,u)+offsetof(VehicleRail,other_multiheaded_part), REF_VEHICLE, 2, 19), // added with 17.1, but was blank since 2. Removed in 20 - // reserve extra space in savegame here. (currently 3 bytes) - SLE_CONDARR(NullStruct,null,SLE_FILE_U8 | SLE_VAR_NULL, 3, 2, 255), + SLE_CONDARR(NullStruct, null, SLE_FILE_U8 | SLE_VAR_NULL, 2, 2, 19), + // reserve extra space in savegame here. (currently 11 bytes) + SLE_CONDARR(NullStruct, null, SLE_FILE_U8 | SLE_VAR_NULL, 11, 2, 255), SLE_END() };