summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortron <tron@openttd.org>2007-01-31 05:08:07 +0000
committertron <tron@openttd.org>2007-01-31 05:08:07 +0000
commit1266624e8827404e1589e79f919d1b7d6b6a0620 (patch)
tree79544aeb18a699289514456382135d2314c0600a
parent49fabae7a198f108d057e7243b5a09c0d158a9c0 (diff)
downloadopenttd-1266624e8827404e1589e79f919d1b7d6b6a0620.tar.xz
(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*)
-rw-r--r--src/station.h3
-rw-r--r--src/station_cmd.cpp5
2 files changed, 1 insertions, 7 deletions
diff --git a/src/station.h b/src/station.h
index ad8548d8e..b4d9d9a88 100644
--- a/src/station.h
+++ b/src/station.h
@@ -146,9 +146,6 @@ struct Station {
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;
diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp
index cf90cb5be..f59dabcc7 100644
--- a/src/station_cmd.cpp
+++ b/src/station_cmd.cpp
@@ -2866,10 +2866,7 @@ static const SaveLoad _station_desc[] = {
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),