Mercurial > hg > openttd

changeset 5877:653723b406f4 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r8475) -Fix Remove the unused remnants of blocked_months_obsolete
author tron <tron@openttd.org>
date Wed, 31 Jan 2007 05:01:29 +0000
parents 7b24ffd1be9a
children 5b8b718434b1
files src/oldloader.cpp src/station.h src/station_cmd.cpp
diffstat 3 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/oldloader.cpp
+++ b/src/oldloader.cpp
@@ -603,9 +603,11 @@
 	OCL_SVAR(  OC_UINT8, Station, owner ),
 	OCL_SVAR(  OC_UINT8, Station, facilities ),
 	OCL_SVAR(  OC_UINT8, Station, airport_type ),
-	OCL_NULL( 2 ),         // Bus/truck status, no longer in use
-	OCL_SVAR(  OC_UINT8, Station, blocked_months_obsolete ),
-	OCL_NULL( 1 ),         // Unknown
+	/* Bus/truck status, no longer in use
+	 * Blocked months
+	 * Unknown
+	 */
+	OCL_NULL( 4 ),
 	OCL_SVAR( OC_FILE_U16 | OC_VAR_U32, Station, airport_flags ),
 	OCL_NULL( 2 ),         // last_vehicle. now last_vehicle_type
 
--- a/src/station.h
+++ b/src/station.h
@@ -148,7 +148,6 @@
 
 	byte truck_stop_status_obsolete;
 	byte bus_stop_status_obsolete;
-	byte blocked_months_obsolete;
 
 	StationRect rect; ///< Station spread out rectangle (not saved) maintained by StationRect_xxx() functions
 
--- a/src/station_cmd.cpp
+++ b/src/station_cmd.cpp
@@ -2870,8 +2870,7 @@
 	SLE_CONDVAR(Station, truck_stop_status_obsolete, SLE_UINT8, 0, 5),
 	SLE_CONDVAR(Station, bus_stop_status_obsolete,   SLE_UINT8, 0, 5),
 
-	// blocked_months was stored here in savegame format 0 - 4.0
-	SLE_CONDVAR(Station, blocked_months_obsolete,    SLE_UINT8, 0, 4),
+	SLE_CONDNULL(1, 0, 4), // Blocked months
 
 	SLE_CONDVAR(Station, airport_flags,              SLE_VAR_U32 | SLE_FILE_U16,  0,  2),
 	SLE_CONDVAR(Station, airport_flags,              SLE_UINT32,                  3, SL_MAX_VERSION),