cpp/openttd-patchpack/source Changeset - r16037:8ed2804bc674

Changeset - r16037:8ed2804bc674

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

frosch - 14 years ago 2010-09-05 13:18:26
frosch@openttd.org

(svn r20740) -Codechange: Add HasTileWaterClass() to test for tiletypes with WaterClass.

1 file changed with 13 insertions and 2 deletions:

src/water_map.h

0 comments (0 inline, 0 general)

src/water_map.h

➞

Show inline comments

@@ @@ -65,6 +65,17 @@ static inline WaterTileType GetWaterTile @@
+}
 /**
  * Checks whether the tile has an waterclass associated.
  * You can then subsequently call GetWaterClass().
  * @param t Tile to query.
  * @return True if the tiletype has a waterclass.
  */
 static inline bool HasTileWaterClass(TileIndex t)
+{
 	return IsTileType(t, MP_WATER) || IsTileType(t, MP_STATION) || IsTileType(t, MP_INDUSTRY) || IsTileType(t, MP_OBJECT);
+}
 /**
  * Get the water class at a tile.
  * @param t Water tile to query.
  * @pre IsTileType(t, MP_WATER) || IsTileType(t, MP_STATION) || IsTileType(t, MP_INDUSTRY) || IsTileType(t, MP_OBJECT)
@@ @@ -72,7 +83,7 @@ static inline WaterTileType GetWaterTile @@
  */
 static inline WaterClass GetWaterClass(TileIndex t)
+{
-	assert(IsTileType(t, MP_WATER) || IsTileType(t, MP_STATION) || IsTileType(t, MP_INDUSTRY) || IsTileType(t, MP_OBJECT));
+	assert(HasTileWaterClass(t));
 	return (WaterClass)GB(_m[t].m1, 5, 2);
+}
@@ @@ -84,7 +95,7 @@ static inline WaterClass GetWaterClass(T @@
  */
 static inline void SetWaterClass(TileIndex t, WaterClass wc)
+{
-	assert(IsTileType(t, MP_WATER) || IsTileType(t, MP_STATION) || IsTileType(t, MP_INDUSTRY) || IsTileType(t, MP_OBJECT));
+	assert(HasTileWaterClass(t));
 	SB(_m[t].m1, 5, 2, wc);
+}

0 comments (0 inline, 0 general)