summaryrefslogtreecommitdiff
path: root/road_cmd.c
diff options
context:
space:
mode:
authortron <tron@openttd.org>2006-08-06 16:32:49 +0000
committertron <tron@openttd.org>2006-08-06 16:32:49 +0000
commit3254155930feb807f81031ebfdc9acedbe33745e (patch)
treef588dd076c3c98d0c2983a7f5c9e5f5dcbc4447b /road_cmd.c
parent7c9165827eb64c74efbad0198e97fe1a77fdb258 (diff)
downloadopenttd-3254155930feb807f81031ebfdc9acedbe33745e.tar.xz
(svn r5794) Pass the TileIndex plus x and y coordinates into GetSlopeZ_* instead of a TileInfo
Diffstat (limited to 'road_cmd.c')
-rw-r--r--road_cmd.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/road_cmd.c b/road_cmd.c
index 4328aa277..e4a725711 100644
--- a/road_cmd.c
+++ b/road_cmd.c
@@ -833,20 +833,20 @@ void DrawRoadDepotSprite(int x, int y, DiagDirection dir)
}
}
-static uint GetSlopeZ_Road(const TileInfo* ti)
+static uint GetSlopeZ_Road(TileIndex tile, uint x, uint y)
{
- Slope tileh = ti->tileh;
- uint z = ti->z;
+ uint z;
+ Slope tileh = GetTileSlope(tile, &z);
if (tileh == SLOPE_FLAT) return z;
- if (GetRoadTileType(ti->tile) == ROAD_TILE_NORMAL) {
- uint f = GetRoadFoundation(tileh, GetRoadBits(ti->tile));
+ if (GetRoadTileType(tile) == ROAD_TILE_NORMAL) {
+ uint f = GetRoadFoundation(tileh, GetRoadBits(tile));
if (f != 0) {
if (f < 15) return z + TILE_HEIGHT; // leveled foundation
tileh = _inclined_tileh[f - 15]; // inclined foundation
}
- return z + GetPartialZ(ti->x & 0xF, ti->y & 0xF, tileh);
+ return z + GetPartialZ(x & 0xF, y & 0xF, tileh);
} else {
return z + TILE_HEIGHT;
}