summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpeter1138 <peter1138@openttd.org>2006-04-17 18:47:50 +0000
committerpeter1138 <peter1138@openttd.org>2006-04-17 18:47:50 +0000
commit7331bfd36a44cede7ee9684f1fb9d6d7b2e89afd (patch)
tree2924369efc12c87c55c8b655a73f232586941ac1
parent712499fc8f395286d0e644e7fdb0812498db59b6 (diff)
downloadopenttd-7331bfd36a44cede7ee9684f1fb9d6d7b2e89afd.tar.xz
(svn r4460) - Newstations: remove unused class_id / stat_id variables from the
Station struct.
-rw-r--r--station.h2
-rw-r--r--station_cmd.c4
-rw-r--r--waypoint.c2
3 files changed, 2 insertions, 6 deletions
diff --git a/station.h b/station.h
index bb9354fd5..e448c14fa 100644
--- a/station.h
+++ b/station.h
@@ -66,8 +66,6 @@ struct Station {
// trainstation width/height
byte trainst_w, trainst_h;
- byte class_id; // custom graphics station class
- byte stat_id; // custom graphics station id in the @class_id class
uint16 build_date;
//uint16 airport_flags;
diff --git a/station_cmd.c b/station_cmd.c
index b07d2c570..f68cfdecf 100644
--- a/station_cmd.c
+++ b/station_cmd.c
@@ -2817,8 +2817,8 @@ static const SaveLoad _station_desc[] = {
SLE_VAR(Station,last_vehicle, SLE_UINT16),
- SLE_CONDVAR(Station,class_id, SLE_UINT8, 3, SL_MAX_VERSION),
- SLE_CONDVAR(Station,stat_id, SLE_UINT8, 3, SL_MAX_VERSION),
+ // Was custom station class and id
+ SLE_CONDNULL(2, 3, 25),
SLE_CONDVAR(Station,build_date, SLE_UINT16, 3, SL_MAX_VERSION),
SLE_CONDREF(Station,bus_stops, REF_ROADSTOPS, 6, SL_MAX_VERSION),
diff --git a/waypoint.c b/waypoint.c
index ea034529a..0efb9a0e3 100644
--- a/waypoint.c
+++ b/waypoint.c
@@ -374,8 +374,6 @@ Station *ComposeWaypointStation(TileIndex tile)
stat.town = GetTown(wp->town_index);
stat.string_id = wp->string == STR_NULL ? /* FIXME? */ 0 : wp->string;
stat.build_date = wp->build_date;
- stat.class_id = 6;
- stat.stat_id = wp->stat_id;
return &stat;
}