summaryrefslogtreecommitdiff
path: root/src/water_cmd.cpp
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2011-11-04 11:30:37 +0000
committerrubidium <rubidium@openttd.org>2011-11-04 11:30:37 +0000
commit19eabdba2cf0184d5dc55cb3b9b8a7b5fe7ccfd3 (patch)
treee0fd85356bbcae38f6b50b8e7bc9470156b81e2d /src/water_cmd.cpp
parent643c54d288e091adf386bacd3615991e24e8909f (diff)
downloadopenttd-19eabdba2cf0184d5dc55cb3b9b8a7b5fe7ccfd3.tar.xz
(svn r23106) -Codechange: pass int* to GetTileSlope and friends
Diffstat (limited to 'src/water_cmd.cpp')
-rw-r--r--src/water_cmd.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/water_cmd.cpp b/src/water_cmd.cpp
index 2a91a0a62..b06d5c590 100644
--- a/src/water_cmd.cpp
+++ b/src/water_cmd.cpp
@@ -149,7 +149,7 @@ void MakeWaterKeepingClass(TileIndex tile, Owner o)
WaterClass wc = GetWaterClass(tile);
/* Autoslope might turn an originally canal or river tile into land */
- uint z;
+ int z;
if (GetTileSlope(tile, &z) != SLOPE_FLAT) wc = WATER_CLASS_INVALID;
if (wc == WATER_CLASS_SEA && z > 0) wc = WATER_CLASS_CANAL;
@@ -796,7 +796,7 @@ void DrawShipDepotSprite(int x, int y, Axis axis, DepotPart part)
static uint GetSlopePixelZ_Water(TileIndex tile, uint x, uint y)
{
- uint z;
+ int z;
Slope tileh = GetTilePixelSlope(tile, &z);
return z + GetPartialPixelZ(x & 0xF, y & 0xF, tileh);
@@ -1079,7 +1079,7 @@ void TileLoop_Water(TileIndex tile)
/* do not try to flood water tiles - increases performance a lot */
if (IsTileType(dest, MP_WATER)) continue;
- uint z_dest;
+ int z_dest;
Slope slope_dest = GetFoundationSlope(dest, &z_dest) & ~SLOPE_HALFTILE_MASK & ~SLOPE_STEEP;
if (z_dest > 0) continue;
@@ -1109,7 +1109,7 @@ void TileLoop_Water(TileIndex tile)
void ConvertGroundTilesIntoWaterTiles()
{
- uint z;
+ int z;
for (TileIndex tile = 0; tile < MapSize(); ++tile) {
Slope slope = GetTileSlope(tile, &z);