mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r20741) -Cleanup: Use IsTileOnWater() in more places.

release/1.1
frosch 2010-09-05 13:18:54 +00:00
parent 435c8d33b0
commit e9cd81953a
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/newgrf_airporttiles.cpp
View File

@ -270,7 +270,7 @@ static void AirportDrawTileLayout(const TileInfo *ti, const TileLayoutSpriteGrou
SpriteID pal = dts->ground.pal; SpriteID pal = dts->ground.pal;
if (GB(image, 0, SPRITE_WIDTH) != 0) { 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); DrawWaterClassGround(ti);
} else { } else {
DrawGroundSprite(image, GroundSpritePaletteTransform(image, pal, GENERAL_SPRITE_COLOUR(colour))); DrawGroundSprite(image, GroundSpritePaletteTransform(image, pal, GENERAL_SPRITE_COLOUR(colour)));

2
src/smallmap_gui.cpp
View File

@ -401,7 +401,7 @@ static inline uint32 GetSmallMapIndustriesPixels(TileIndex tile, TileType t)
return GetIndustrySpec(Industry::GetByTile(tile)->type)->map_colour * 0x01010101; return GetIndustrySpec(Industry::GetByTile(tile)->type)->map_colour * 0x01010101;
} else { } else {
/* Otherwise, return the colour which will make it disappear */ /* 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);
} }
} }

2
src/station_cmd.cpp
View File

@ -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) { if (ti->tileh == SLOPE_FLAT) {
DrawWaterClassGround(ti); DrawWaterClassGround(ti);
} else { } else {

2
src/water_cmd.cpp
View File

@ -485,7 +485,7 @@ static bool IsWateredTile(TileIndex tile, Direction from)
if ((IsTileType(src_tile, MP_STATION) && IsOilRig(src_tile)) || if ((IsTileType(src_tile, MP_STATION) && IsOilRig(src_tile)) ||
(IsTileType(src_tile, MP_INDUSTRY))) return true; (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); return (IsDock(tile) && GetTileSlope(tile, NULL) == SLOPE_FLAT) || IsBuoy(tile);