mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r4155) -Changed GetRoadStopByTile to use GetStationType and moved it. TODO: unify RS_TRUCK and STATION_TRUCK (same for bus)

release/0.5
celestar 2006-03-29 19:37:18 +00:00
parent 8310a46351
commit 3ae99e17bb
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
station.h
View File

@ -194,11 +194,6 @@ uint GetStationPlatforms(const Station *st, TileIndex tile);
void StationPickerDrawSprite(int x, int y, RailType railtype, int image); void StationPickerDrawSprite(int x, int y, RailType railtype, int image);
RoadStop * GetRoadStopByTile(TileIndex tile, RoadStopType type); RoadStop * GetRoadStopByTile(TileIndex tile, RoadStopType type);
static inline RoadStopType GetRoadStopType(TileIndex tile)
{
return (_m[tile].m5 < 0x47) ? RS_TRUCK : RS_BUS;
}
RoadStop * GetPrimaryRoadStop(const Station *st, RoadStopType type); RoadStop * GetPrimaryRoadStop(const Station *st, RoadStopType type);
uint GetNumRoadStops(const Station* st, RoadStopType type); uint GetNumRoadStops(const Station* st, RoadStopType type);
RoadStop * AllocateRoadStop( void ); RoadStop * AllocateRoadStop( void );

6
station_map.h
View File

@ -60,6 +60,12 @@ typedef enum StationType {
StationType GetStationType(TileIndex); StationType GetStationType(TileIndex);
static inline RoadStopType GetRoadStopType(TileIndex t)
{
assert(GetStationType(t) == STATION_TRUCK || GetStationType(t) == STATION_BUS);
return GetStationType(t) == STATION_TRUCK ? RS_TRUCK : RS_BUS;
}
static inline bool IsRailwayStation(TileIndex t) static inline bool IsRailwayStation(TileIndex t)
{ {
return _m[t].m5 < RAILWAY_BASE + RAILWAY_SIZE; return _m[t].m5 < RAILWAY_BASE + RAILWAY_SIZE;