cpp/openttd-patchpack/source Changeset - r5905:e06ef9d715c2

Changeset - r5905:e06ef9d715c2

Parent rev.

Child rev.

[Not reviewed]

master

0 4 0

celestar - 18 years ago 2007-02-02 07:48:06
celestar@openttd.org

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

4 files changed with 6 insertions and 6 deletions:

src/station_cmd.cpp

src/station_map.cpp

src/station_map.h

src/water_cmd.cpp

0 comments (0 inline, 0 general)

src/station_cmd.cpp

➞

Show inline comments

@@ @@ -2149,7 +2149,7 @@ static uint32 GetTileTrackStatus_Station @@
 		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:

src/station_map.cpp

➞

Show inline comments

@@ @@ -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;
+}

src/station_map.h

➞

Show inline comments

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

src/water_cmd.cpp

➞

Show inline comments

@@ @@ -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;
+	}
+}

0 comments (0 inline, 0 general)