From 3b6cbf62d423a7dde0c3dc6adfebdbc5e62c57d5 Mon Sep 17 00:00:00 2001 From: peter1138 Date: Mon, 17 Apr 2006 18:47:50 +0000 Subject: [PATCH] (svn r4460) - Newstations: remove unused class_id / stat_id variables from the Station struct. --- station.h | 2 -- station_cmd.c | 4 ++-- waypoint.c | 2 -- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/station.h b/station.h index bb9354fd5e..e448c14fa9 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 b07d2c5702..f68cfdecfd 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 ea034529a2..0efb9a0e30 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; }