summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcelestar <celestar@openttd.org>2007-02-02 07:48:06 +0000
committercelestar <celestar@openttd.org>2007-02-02 07:48:06 +0000
commit90528dc78efe2d12157a3a18caa24c08a1869ff6 (patch)
tree7e18e258a052e6e184e826308ce0b3d4e043101c
parentae3982dbecaf2d888427272edf36aa980641783c (diff)
downloadopenttd-90528dc78efe2d12157a3a18caa24c08a1869ff6.tar.xz
(svn r8528) -Codechange: Rename IsBuoy_() to IsBuoy() now that the naming conflict no longer exists.
-rw-r--r--src/station_cmd.cpp2
-rw-r--r--src/station_map.cpp2
-rw-r--r--src/station_map.h6
-rw-r--r--src/water_cmd.cpp2
4 files changed, 6 insertions, 6 deletions
diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp
index ecc8b9148..ed47d2847 100644
--- a/src/station_cmd.cpp
+++ b/src/station_cmd.cpp
@@ -2149,7 +2149,7 @@ static uint32 GetTileTrackStatus_Station(TileIndex tile, TransportType mode)
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:
diff --git a/src/station_map.cpp b/src/station_map.cpp
index 6341cd6ba..b8c0fda52 100644
--- a/src/station_map.cpp
+++ b/src/station_map.cpp
@@ -14,6 +14,6 @@ StationType GetStationType(TileIndex t)
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;
}
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));
diff --git a/src/water_cmd.cpp b/src/water_cmd.cpp
index 42fa1b9fc..048d6d45e 100644
--- a/src/water_cmd.cpp
+++ b/src/water_cmd.cpp
@@ -352,7 +352,7 @@ static bool IsWateredTile(TileIndex tile)
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;
}
}