(svn r8528) -Codechange: Rename IsBuoy_() to IsBuoy() now that the naming conflict no longer exists.

This commit is contained in:
celestar
2007-02-02 07:48:06 +00:00
parent bf4f9a84bc
commit c95736046b
4 changed files with 6 additions and 6 deletions

View File

@@ -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));