(svn r20631) -Codechange: generalise IsIndustryTileOnWater + simplify so related code

This commit is contained in:
rubidium
2010-08-26 19:29:20 +00:00
parent 327451e820
commit 08a41c6ee5
5 changed files with 21 additions and 26 deletions

View File

@@ -68,6 +68,7 @@ static inline WaterTileType GetWaterTileType(TileIndex t)
/**
* 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)
* @return Water class at the tile.
*/
static inline WaterClass GetWaterClass(TileIndex t)
@@ -80,6 +81,7 @@ static inline WaterClass GetWaterClass(TileIndex t)
* Set the water class at a tile.
* @param t Water tile to change.
* @param wc New water class.
* @pre IsTileType(t, MP_WATER) || IsTileType(t, MP_STATION) || IsTileType(t, MP_INDUSTRY) || IsTileType(t, MP_OBJECT)
*/
static inline void SetWaterClass(TileIndex t, WaterClass wc)
{
@@ -87,6 +89,17 @@ static inline void SetWaterClass(TileIndex t, WaterClass wc)
SB(_m[t].m1, 5, 2, wc);
}
/**
* Tests if the tile was built on water.
* @param t the tile to check
* @pre IsTileType(t, MP_WATER) || IsTileType(t, MP_STATION) || IsTileType(t, MP_INDUSTRY) || IsTileType(t, MP_OBJECT)
* @return true iff on water
*/
static inline bool IsTileOnWater(TileIndex t)
{
return (GetWaterClass(t) != WATER_CLASS_INVALID);
}
/**
* Is it a plain water tile?
* @param t Water tile to query.