From 5d4241db3031c264003565b230836a170345824e Mon Sep 17 00:00:00 2001 From: tron Date: Wed, 31 Jan 2007 05:01:29 +0000 Subject: (svn r8475) -Fix Remove the unused remnants of blocked_months_obsolete --- src/oldloader.cpp | 8 +++++--- src/station.h | 1 - src/station_cmd.cpp | 3 +-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/oldloader.cpp b/src/oldloader.cpp index 841a76569..0c9bf6d3b 100644 --- a/src/oldloader.cpp +++ b/src/oldloader.cpp @@ -603,9 +603,11 @@ static const OldChunks station_chunk[] = { 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 diff --git a/src/station.h b/src/station.h index a79fb3801..ad8548d8e 100644 --- a/src/station.h +++ b/src/station.h @@ -148,7 +148,6 @@ struct Station { 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 diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp index b3ac6e70b..cf90cb5be 100644 --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -2870,8 +2870,7 @@ static const SaveLoad _station_desc[] = { 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), -- cgit v1.2.3-70-g09d2