equal
deleted
inserted
replaced
321 |
321 |
322 EndSpriteCombine(); |
322 EndSpriteCombine(); |
323 } |
323 } |
324 |
324 |
325 |
325 |
326 static uint GetSlopeZ_Trees(const TileInfo* ti) |
326 static uint GetSlopeZ_Trees(TileIndex tile, uint x, uint y) |
327 { |
327 { |
328 return GetPartialZ(ti->x & 0xF, ti->y & 0xF, ti->tileh) + ti->z; |
328 uint z; |
|
329 uint tileh = GetTileSlope(tile, &z); |
|
330 |
|
331 return z + GetPartialZ(x & 0xF, y & 0xF, tileh); |
329 } |
332 } |
330 |
333 |
331 static Slope GetSlopeTileh_Trees(TileIndex tile, Slope tileh) |
334 static Slope GetSlopeTileh_Trees(TileIndex tile, Slope tileh) |
332 { |
335 { |
333 return tileh; |
336 return tileh; |