Mercurial > hg > openttd
changeset 16048:10d12cc76399 draft
(svn r20741) -Cleanup: Use IsTileOnWater() in more places.
| author | frosch <frosch@openttd.org> |
|---|---|
| date | Sun, 05 Sep 2010 13:18:54 +0000 |
| parents | b5d463b5b6ba |
| children | bee848c6255d |
| files | src/newgrf_airporttiles.cpp src/smallmap_gui.cpp src/station_cmd.cpp src/water_cmd.cpp |
| diffstat | 4 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/newgrf_airporttiles.cpp +++ b/src/newgrf_airporttiles.cpp @@ -270,7 +270,7 @@ 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)));
--- a/src/smallmap_gui.cpp +++ b/src/smallmap_gui.cpp @@ -401,7 +401,7 @@ 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); } }
--- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -2663,7 +2663,7 @@ } } - 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 {
--- a/src/water_cmd.cpp +++ b/src/water_cmd.cpp @@ -485,7 +485,7 @@ 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);