diff options
| author | frosch <frosch@openttd.org> | 2010-09-05 13:18:54 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2010-09-05 13:18:54 +0000 |
| commit | e9cd81953ac0e9efa0149b134c75fa8ba45cbc9c (patch) | |
| tree | 2797a65c9f2d38168ffaa6022ea40bcbe350e577 | |
| parent | 435c8d33b0658c97648f18fbc38682ce09e321b2 (diff) | |
| download | openttd-e9cd81953ac0e9efa0149b134c75fa8ba45cbc9c.tar.xz | |
(svn r20741) -Cleanup: Use IsTileOnWater() in more places.
| -rw-r--r-- | src/newgrf_airporttiles.cpp | 2 | ||||
| -rw-r--r-- | src/smallmap_gui.cpp | 2 | ||||
| -rw-r--r-- | src/station_cmd.cpp | 2 | ||||
| -rw-r--r-- | src/water_cmd.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/newgrf_airporttiles.cpp b/src/newgrf_airporttiles.cpp index 97eecc1b9..02500a0fd 100644 --- a/src/newgrf_airporttiles.cpp +++ b/src/newgrf_airporttiles.cpp @@ -270,7 +270,7 @@ static void AirportDrawTileLayout(const TileInfo *ti, const TileLayoutSpriteGrou SpriteID pal = dts->ground.pal; if (GB(image, 0, SPRITE_WIDTH) != 0) { - if (image == SPR_FLAT_WATER_TILE && GetWaterClass(ti->tile) != WATER_CLASS_INVALID) { + if (image == SPR_FLAT_WATER_TILE && IsTileOnWater(ti->tile)) { DrawWaterClassGround(ti); } else { DrawGroundSprite(image, GroundSpritePaletteTransform(image, pal, GENERAL_SPRITE_COLOUR(colour))); diff --git a/src/smallmap_gui.cpp b/src/smallmap_gui.cpp index 7e6faee27..454409bdd 100644 --- a/src/smallmap_gui.cpp +++ b/src/smallmap_gui.cpp @@ -401,7 +401,7 @@ static inline uint32 GetSmallMapIndustriesPixels(TileIndex tile, TileType t) return GetIndustrySpec(Industry::GetByTile(tile)->type)->map_colour * 0x01010101; } else { /* Otherwise, return the colour which will make it disappear */ - t = (GetWaterClass(tile) == WATER_CLASS_INVALID) ? MP_CLEAR : MP_WATER; + t = (IsTileOnWater(tile) ? MP_WATER : MP_CLEAR); } } diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp index 12ea763d6..74b4f484b 100644 --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -2663,7 +2663,7 @@ static void DrawTile_Station(TileInfo *ti) } } - if (IsBuoy(ti->tile) || IsDock(ti->tile) || (IsOilRig(ti->tile) && GetWaterClass(ti->tile) != WATER_CLASS_INVALID)) { + if (IsBuoy(ti->tile) || IsDock(ti->tile) || (IsOilRig(ti->tile) && IsTileOnWater(ti->tile))) { if (ti->tileh == SLOPE_FLAT) { DrawWaterClassGround(ti); } else { diff --git a/src/water_cmd.cpp b/src/water_cmd.cpp index 6f24956b1..8b17d968f 100644 --- a/src/water_cmd.cpp +++ b/src/water_cmd.cpp @@ -485,7 +485,7 @@ static bool IsWateredTile(TileIndex tile, Direction from) if ((IsTileType(src_tile, MP_STATION) && IsOilRig(src_tile)) || (IsTileType(src_tile, MP_INDUSTRY))) return true; - return GetWaterClass(tile) != WATER_CLASS_INVALID; + return IsTileOnWater(tile); } return (IsDock(tile) && GetTileSlope(tile, NULL) == SLOPE_FLAT) || IsBuoy(tile); |