diff options
| author | frosch <frosch@openttd.org> | 2008-04-02 14:13:15 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2008-04-02 14:13:15 +0000 |
| commit | fa68e5f77026835b02e1dc3d8eef09b57aac8249 (patch) | |
| tree | 1c88a7fa03add5b3c621da72df5f777b12fdd26c /src/water_cmd.cpp | |
| parent | 5e5e074a5dc68ed495de3234fda15989db34e23d (diff) | |
| download | openttd-fa68e5f77026835b02e1dc3d8eef09b57aac8249.tar.xz | |
(svn r12541) -Codechange: Declare Slope enum as bit set, and remove some (then) unneeded casts.
Diffstat (limited to 'src/water_cmd.cpp')
| -rw-r--r-- | src/water_cmd.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/water_cmd.cpp b/src/water_cmd.cpp index 349d0cab8..eba83f1d3 100644 --- a/src/water_cmd.cpp +++ b/src/water_cmd.cpp @@ -1040,7 +1040,7 @@ void TileLoop_Water(TileIndex tile) if (IsTileType(dest, MP_WATER)) continue; uint z_dest; - Slope slope_dest = (Slope)(GetFoundationSlope(dest, &z_dest) & ~SLOPE_HALFTILE_MASK & ~SLOPE_STEEP); + Slope slope_dest = GetFoundationSlope(dest, &z_dest) & ~SLOPE_HALFTILE_MASK & ~SLOPE_STEEP; if (z_dest > 0) continue; if (!HasBit(_flood_from_dirs[slope_dest], ReverseDir(dir))) continue; @@ -1050,7 +1050,7 @@ void TileLoop_Water(TileIndex tile) break; case FLOOD_DRYUP: { - Slope slope_here = (Slope)(GetFoundationSlope(tile, NULL) & ~SLOPE_HALFTILE_MASK & ~SLOPE_STEEP); + Slope slope_here = GetFoundationSlope(tile, NULL) & ~SLOPE_HALFTILE_MASK & ~SLOPE_STEEP; uint check_dirs = _flood_from_dirs[slope_here]; uint dir; FOR_EACH_SET_BIT(dir, check_dirs) { @@ -1097,7 +1097,7 @@ void ConvertGroundTilesIntoWaterTiles() uint dir; FOR_EACH_SET_BIT(dir, check_dirs) { TileIndex dest = TILE_ADD(tile, TileOffsByDir((Direction)dir)); - Slope slope_dest = (Slope)(GetTileSlope(dest, NULL) & ~SLOPE_STEEP); + Slope slope_dest = GetTileSlope(dest, NULL) & ~SLOPE_STEEP; if (slope_dest == SLOPE_FLAT || IsSlopeWithOneCornerRaised(slope_dest)) { MakeShore(tile); break; |