diff options
author | celestar <celestar@openttd.org> | 2007-02-02 07:48:06 +0000 |
---|---|---|
committer | celestar <celestar@openttd.org> | 2007-02-02 07:48:06 +0000 |
commit | 90528dc78efe2d12157a3a18caa24c08a1869ff6 (patch) | |
tree | 7e18e258a052e6e184e826308ce0b3d4e043101c /src/station_map.h | |
parent | ae3982dbecaf2d888427272edf36aa980641783c (diff) | |
download | openttd-90528dc78efe2d12157a3a18caa24c08a1869ff6.tar.xz |
(svn r8528) -Codechange: Rename IsBuoy_() to IsBuoy() now that the naming conflict no longer exists.
Diffstat (limited to 'src/station_map.h')
-rw-r--r-- | src/station_map.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/station_map.h b/src/station_map.h index 460df15f8..fed210766 100644 --- a/src/station_map.h +++ b/src/station_map.h @@ -162,14 +162,14 @@ static inline bool IsDock(TileIndex t) return IS_BYTE_INSIDE(GetStationGfx(t), GFX_DOCK_BASE, GFX_DOCK_BASE + DOCK_SIZE_TOTAL); } -static inline bool IsBuoy_(TileIndex t) // XXX _ due to naming conflict +static inline bool IsBuoy(TileIndex t) { return GetStationGfx(t) == GFX_BUOY_BASE; } static inline bool IsBuoyTile(TileIndex t) { - return IsTileType(t, MP_STATION) && IsBuoy_(t); + return IsTileType(t, MP_STATION) && IsBuoy(t); } @@ -221,7 +221,7 @@ static inline TileIndexDiffC GetDockOffset(TileIndex t) }; assert(IsTileType(t, MP_STATION)); - if (IsBuoy_(t)) return buoy_offset; + if (IsBuoy(t)) return buoy_offset; if (IsOilRig(t)) return oilrig_offset; assert(IsDock(t)); |