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

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

release/0.6
celestar 2007-02-02 07:48:06 +00:00
parent ae3982dbec
commit 90528dc78e
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/station_cmd.cpp
View File

@ -2149,7 +2149,7 @@ static uint32 GetTileTrackStatus_Station(TileIndex tile, TransportType mode)
case TRANSPORT_WATER: case TRANSPORT_WATER:
// buoy is coded as a station, it is always on open 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; break;
case TRANSPORT_ROAD: case TRANSPORT_ROAD:

2
src/station_map.cpp
View File

@ -14,6 +14,6 @@ StationType GetStationType(TileIndex t)
if (IsBusStop(t)) return STATION_BUS; if (IsBusStop(t)) return STATION_BUS;
if (IsOilRig(t)) return STATION_OILRIG; if (IsOilRig(t)) return STATION_OILRIG;
if (IsDock(t)) return STATION_DOCK; if (IsDock(t)) return STATION_DOCK;
assert(IsBuoy_(t)); assert(IsBuoy(t));
return STATION_BUOY; return STATION_BUOY;
} }

6
src/station_map.h
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); 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; return GetStationGfx(t) == GFX_BUOY_BASE;
} }
static inline bool IsBuoyTile(TileIndex t) 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)); assert(IsTileType(t, MP_STATION));
if (IsBuoy_(t)) return buoy_offset; if (IsBuoy(t)) return buoy_offset;
if (IsOilRig(t)) return oilrig_offset; if (IsOilRig(t)) return oilrig_offset;
assert(IsDock(t)); assert(IsDock(t));

2
src/water_cmd.cpp
View File

@ -352,7 +352,7 @@ static bool IsWateredTile(TileIndex tile)
return false; return false;
} }
case MP_STATION: return IsOilRig(tile) || IsDock(tile) || IsBuoy_(tile); case MP_STATION: return IsOilRig(tile) || IsDock(tile) || IsBuoy(tile);
default: return false; default: return false;
} }
} }