summaryrefslogtreecommitdiff
path: root/src/landscape.cpp
diff options
context:
space:
mode:
authorfrosch <frosch@openttd.org>2009-02-25 21:29:50 +0000
committerfrosch <frosch@openttd.org>2009-02-25 21:29:50 +0000
commit8ebe68b01b4d033bde4b8082461891959d8fc4a2 (patch)
treeb564a00f660cd32d8c8f6fbeca4fd2642c760312 /src/landscape.cpp
parent751a9bdf0a84666d37a05d7e2c92dfbc135a134a (diff)
downloadopenttd-8ebe68b01b4d033bde4b8082461891959d8fc4a2.tar.xz
(svn r15583) -Fix: Do not use TILE_MASK when you do not want to wrap around them map.
Diffstat (limited to 'src/landscape.cpp')
-rw-r--r--src/landscape.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/landscape.cpp b/src/landscape.cpp
index 998a552d4..15d70bbfd 100644
--- a/src/landscape.cpp
+++ b/src/landscape.cpp
@@ -830,8 +830,8 @@ static void CreateDesertOrRainForest()
for (data = _make_desert_or_rainforest_data;
data != endof(_make_desert_or_rainforest_data); ++data) {
- TileIndex t = TILE_MASK(tile + ToTileIndexDiff(*data));
- if (TileHeight(t) >= 4 || IsTileType(t, MP_WATER)) break;
+ TileIndex t = AddTileIndexDiffCWrap(tile, *data);
+ if (t != INVALID_TILE && (TileHeight(t) >= 4 || IsTileType(t, MP_WATER))) break;
}
if (data == endof(_make_desert_or_rainforest_data))
SetTropicZone(tile, TROPICZONE_DESERT);
@@ -848,8 +848,8 @@ static void CreateDesertOrRainForest()
for (data = _make_desert_or_rainforest_data;
data != endof(_make_desert_or_rainforest_data); ++data) {
- TileIndex t = TILE_MASK(tile + ToTileIndexDiff(*data));
- if (IsTileType(t, MP_CLEAR) && IsClearGround(t, CLEAR_DESERT)) break;
+ TileIndex t = AddTileIndexDiffCWrap(tile, *data);
+ if (t != INVALID_TILE && IsTileType(t, MP_CLEAR) && IsClearGround(t, CLEAR_DESERT)) break;
}
if (data == endof(_make_desert_or_rainforest_data))
SetTropicZone(tile, TROPICZONE_RAINFOREST);