From 8343340acb5bdb40555e04f40aac567d6e583bb8 Mon Sep 17 00:00:00 2001 From: smatz Date: Wed, 24 Jun 2009 17:39:54 +0000 Subject: (svn r16643) -Codechange: replace GetStationByTile() by Station::GetByTile() --- src/newgrf_station.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/newgrf_station.cpp') diff --git a/src/newgrf_station.cpp b/src/newgrf_station.cpp index 38f4c88c0..7bb69341e 100644 --- a/src/newgrf_station.cpp +++ b/src/newgrf_station.cpp @@ -6,7 +6,7 @@ #include "variables.h" #include "landscape.h" #include "debug.h" -#include "station_map.h" +#include "station_base.h" #include "roadstop_base.h" #include "newgrf_commons.h" #include "newgrf_station.h" @@ -469,7 +469,7 @@ static uint32 StationGetVariable(const ResolverObject *object, byte variable, by uint32 res = GB(GetStationGfx(nearby_tile), 1, 2) << 12 | !!perpendicular << 11 | !!same_station << 10; if (IsCustomStationSpecIndex(nearby_tile)) { - const StationSpecList ssl = GetStationByTile(nearby_tile)->speclist[GetCustomStationSpecIndex(nearby_tile)]; + const StationSpecList ssl = Station::GetByTile(nearby_tile)->speclist[GetCustomStationSpecIndex(nearby_tile)]; res |= 1 << (ssl.grfid != grfid ? 9 : 8) | ssl.localidx; } return res; @@ -858,7 +858,7 @@ const StationSpec *GetStationSpec(TileIndex t) if (!IsCustomStationSpecIndex(t)) return NULL; - st = GetStationByTile(t); + st = Station::GetByTile(t); specindex = GetCustomStationSpecIndex(t); return specindex < st->num_specs ? st->speclist[specindex].spec : NULL; } @@ -890,7 +890,7 @@ void AnimateStationTile(TileIndex tile) const StationSpec *ss = GetStationSpec(tile); if (ss == NULL) return; - const Station *st = GetStationByTile(tile); + const Station *st = Station::GetByTile(tile); uint8 animation_speed = ss->anim_speed; @@ -1023,7 +1023,7 @@ void StationAnimationTrigger(const Station *st, TileIndex tile, StatAnimTrigger }; /* Get Station if it wasn't supplied */ - if (st == NULL) st = GetStationByTile(tile); + if (st == NULL) st = Station::GetByTile(tile); /* Check the cached animation trigger bitmask to see if we need * to bother with any further processing. */ -- cgit v1.2.3-70-g09d2