(svn r8476) -Fix
authortron
Wed, 31 Jan 2007 05:08:07 +0000
changeset 6129 a31e9d63bba2
parent 6128 46154e074b58
child 6130 f67231d82e91
(svn r8476) -Fix

Remove the unused remnants of {bus,truck}_stop_status_obsolete
(though I wonder a bit why this information doesn't get converted on load *shrug*)
src/station.h
src/station_cmd.cpp
--- a/src/station.h	Wed Jan 31 05:01:29 2007 +0000
+++ b/src/station.h	Wed Jan 31 05:08:07 2007 +0000
@@ -146,9 +146,6 @@
 	TileIndex bus_tile_obsolete;
 	TileIndex lorry_tile_obsolete;
 
-	byte truck_stop_status_obsolete;
-	byte bus_stop_status_obsolete;
-
 	StationRect rect; ///< Station spread out rectangle (not saved) maintained by StationRect_xxx() functions
 
 	static const int cDebugCtorLevel = 3;
--- a/src/station_cmd.cpp	Wed Jan 31 05:01:29 2007 +0000
+++ b/src/station_cmd.cpp	Wed Jan 31 05:08:07 2007 +0000
@@ -2866,10 +2866,7 @@
 	    SLE_VAR(Station, facilities,                 SLE_UINT8),
 	    SLE_VAR(Station, airport_type,               SLE_UINT8),
 
-	// truck/bus_stop_status was stored here in savegame format 0 - 6
-	SLE_CONDVAR(Station, truck_stop_status_obsolete, SLE_UINT8, 0, 5),
-	SLE_CONDVAR(Station, bus_stop_status_obsolete,   SLE_UINT8, 0, 5),
-
+	SLE_CONDNULL(2, 0, 5), // Truck/bus stop status
 	SLE_CONDNULL(1, 0, 4), // Blocked months
 
 	SLE_CONDVAR(Station, airport_flags,              SLE_VAR_U32 | SLE_FILE_U16,  0,  2),