dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r16938) -Codechange: introduce helper function to tell whether a tile is either a rail station or rail waypoint tile

Browse Source
This commit is contained in:
rubidium
2009-07-24 11:15:11 +00:00
parent 36ebb4fe58
commit 00a9b2fd3d
12 changed files with 36 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/newgrf_station.cpp
View File

@@ -283,7 +283,7 @@ static TileIndex FindRailStationEnd(TileIndex tile, TileIndexDiff delta, bool ch
TileIndex new_tile = TILE_ADD(tile, delta);
if (!IsTileType(new_tile, MP_STATION) || GetStationIndex(new_tile) != sid) break;
if (!IsRailwayStation(new_tile) && !IsRailWaypoint(new_tile)) break;
if (!HasStationRail(new_tile)) break;
if (check_type && GetCustomStationSpecIndex(new_tile) != orig_type) break;
if (check_axis && GetRailStationAxis(new_tile) != orig_axis) break;
@@ -479,7 +479,7 @@ static uint32 StationGetVariable(const ResolverObject *object, byte variable, by
case 0x68: { // Station info of nearby tiles
TileIndex nearby_tile = GetNearbyTile(parameter, tile);
if (!IsRailwayStationTile(nearby_tile)) return 0xFFFFFFFF;
if (!HasStationTileRail(nearby_tile)) return 0xFFFFFFFF;
uint32 grfid = st->speclist[GetCustomStationSpecIndex(tile)].grfid;
bool perpendicular = GetRailStationAxis(tile) != GetRailStationAxis(nearby_tile);