From 1d11bbb34da6bb1cfd8d8351f61940c92027ed55 Mon Sep 17 00:00:00 2001 From: hackykid Date: Sun, 17 Jul 2005 20:09:02 +0000 Subject: (svn r2625) - Fix: [pbs] Store the end of a train's reserved path explicitly. Prevents trains from unreserving eachothers paths in some cases. - CodeChange: Use the TrackdirToTrack function instead of &7, and remove an unneeded variable. --- vehicle.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'vehicle.c') diff --git a/vehicle.c b/vehicle.c index 6eae858ed..9d4580c67 100644 --- a/vehicle.c +++ b/vehicle.c @@ -1947,8 +1947,10 @@ static const SaveLoad _train_desc[] = { SLE_CONDVARX(offsetof(Vehicle,u)+offsetof(VehicleRail,days_since_order_progr), SLE_UINT16, 2, 255), SLE_CONDVARX(offsetof(Vehicle,u)+offsetof(VehicleRail,pbs_status), SLE_UINT8, 2, 255), - // reserve extra space in savegame here. (currently 12 bytes) - SLE_CONDARR(NullStruct,null,SLE_FILE_U8 | SLE_VAR_NULL, 12, 2, 255), + SLE_CONDVARX(offsetof(Vehicle,u)+offsetof(VehicleRail,pbs_end_tile), SLE_UINT32, 2, 255), + SLE_CONDVARX(offsetof(Vehicle,u)+offsetof(VehicleRail,pbs_end_trackdir), SLE_UINT8, 2, 255), + // reserve extra space in savegame here. (currently 7 bytes) + SLE_CONDARR(NullStruct,null,SLE_FILE_U8 | SLE_VAR_NULL, 7, 2, 255), SLE_END() }; -- cgit v1.2.3-70-g09d2