Mercurial > hg > openttd
changeset 6849:cbe1a12e652d draft
(svn r10089) -Fix (r10040): Use GetTileZ instead of GetClearGround in GetTerrainType as
GetTileZ is valid for any tile type. Also use GetTerrainType for stations.
| author | maedhros <maedhros@openttd.org> |
|---|---|
| date | Mon, 11 Jun 2007 04:52:51 +0000 |
| parents | 2dcc88253d83 |
| children | 500f7e6d4ec9 |
| files | src/newgrf_commons.cpp src/newgrf_station.cpp |
| diffstat | 2 files changed, 4 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/newgrf_commons.cpp +++ b/src/newgrf_commons.cpp @@ -7,7 +7,7 @@ #include "stdafx.h" #include "openttd.h" #include "variables.h" -#include "clear_map.h" +#include "landscape.h" #include "town.h" #include "industry.h" #include "newgrf.h" @@ -229,7 +229,7 @@ { switch (_opt.landscape) { case LT_TROPIC: return GetTropicZone(tile) == TROPICZONE_DESERT ? 1 : 2; - case LT_ARCTIC: return (GetClearGround(tile) == CLEAR_SNOW) ? 4 : 0; + case LT_ARCTIC: return GetTileZ(tile) >= GetSnowLine() ? 4 : 0; default: return 0; } }
--- a/src/newgrf_station.cpp +++ b/src/newgrf_station.cpp @@ -15,6 +15,7 @@ #include "station_map.h" #include "newgrf.h" #include "newgrf_callbacks.h" +#include "newgrf_commons.h" #include "newgrf_station.h" #include "newgrf_spritegroup.h" #include "date.h" @@ -388,10 +389,7 @@ /* Calculated station variables */ case 0x40: return GetPlatformInfoHelper(tile, false, false, false); case 0x41: return GetPlatformInfoHelper(tile, true, false, false); - case 0x42: // Terrain and rail type - return ((_opt.landscape == LT_ARCTIC && GetTileZ(tile) > GetSnowLine()) ? 4 : 0) | - (_opt.landscape == LT_TROPIC ? GetTropicZone(tile) : 0) | - (GetRailType(tile) << 8); + case 0x42: return GetTerrainType(tile) | (GetRailType(tile) << 8); case 0x43: return st->owner; // Station owner case 0x44: return 2; // PBS status case 0x45: return GetRailContinuationInfo(tile);