Mercurial > hg > openttd
changeset 5905:8deb9c547842 draft
(svn r8528) -Codechange: Rename IsBuoy_() to IsBuoy() now that the naming conflict no longer exists.
| author | celestar <celestar@openttd.org> |
|---|---|
| date | Fri, 02 Feb 2007 07:48:06 +0000 |
| parents | d68ff0b70608 |
| children | f32b2fad0bb8 |
| files | src/station_cmd.cpp src/station_map.cpp src/station_map.h src/water_cmd.cpp |
| diffstat | 4 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -2149,7 +2149,7 @@ case TRANSPORT_WATER: // buoy is coded as a station, it is always on open water - if (IsBuoy_(tile)) return TRACK_BIT_ALL * 0x101; + if (IsBuoy(tile)) return TRACK_BIT_ALL * 0x101; break; case TRANSPORT_ROAD:
--- a/src/station_map.cpp +++ b/src/station_map.cpp @@ -14,6 +14,6 @@ if (IsBusStop(t)) return STATION_BUS; if (IsOilRig(t)) return STATION_OILRIG; if (IsDock(t)) return STATION_DOCK; - assert(IsBuoy_(t)); + assert(IsBuoy(t)); return STATION_BUOY; }
--- a/src/station_map.h +++ b/src/station_map.h @@ -162,14 +162,14 @@ 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 @@ }; 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));