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

(svn r21745) -Fix: [NewGRF] Canal variable 80 shall return consistent heights within a lock.

release/1.1
frosch 2011-01-09 13:53:05 +00:00
parent 716f4e924e
commit 8ffc288901
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/newgrf_canal.cpp
View File

@ -47,7 +47,12 @@ static uint32 CanalGetVariable(const ResolverObject *object, byte variable, byte
switch (variable) { switch (variable) {
/* Height of tile */ /* Height of tile */
case 0x80: return GetTileZ(tile) / TILE_HEIGHT; case 0x80: {
uint z = GetTileZ(tile) / TILE_HEIGHT;
/* Return consistent height within locks */
if (IsTileType(tile, MP_WATER) && IsLock(tile) && GetSection(tile) == LOCK_UPPER) z--;
return z;
}
/* Terrain type */ /* Terrain type */
case 0x81: return GetTerrainType(tile); case 0x81: return GetTerrainType(tile);