summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsmatz <smatz@openttd.org>2008-09-29 18:23:56 +0000
committersmatz <smatz@openttd.org>2008-09-29 18:23:56 +0000
commit1c126cb2e65cf5823ad8fc25bf0fe329a37177ad (patch)
treedebb7fbb62b28da95ff3ef8e7d9339fa0f8886d2
parent5ab74534da3f94cd1c43bc438dcc0d31b23408e5 (diff)
downloadopenttd-1c126cb2e65cf5823ad8fc25bf0fe329a37177ad.tar.xz
(svn r14415) -Fix (r10074): void tiles could be the nearest 'land' for water industries
-rw-r--r--src/newgrf_industries.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/newgrf_industries.cpp b/src/newgrf_industries.cpp
index 307cd2c0c..b01f9e738 100644
--- a/src/newgrf_industries.cpp
+++ b/src/newgrf_industries.cpp
@@ -52,7 +52,7 @@ static uint GetClosestWaterDistance(TileIndex tile, bool water)
TileIndex t;
int best_dist;
for (t = 0; t < MapSize(); t++) {
- if (IsTileType(t, MP_WATER) == water) break;
+ if (!IsTileType(t, MP_VOID) && IsTileType(t, MP_WATER) == water) break;
}
if (t == MapSize() && !water) return 0x200;
best_dist = DistanceManhattan(tile, t);
@@ -60,7 +60,7 @@ static uint GetClosestWaterDistance(TileIndex tile, bool water)
for (; t < MapSize(); t++) {
int dist = DistanceManhattan(tile, t);
if (dist < best_dist) {
- if (IsTileType(t, MP_WATER) == water) best_dist = dist;
+ if (!IsTileType(t, MP_VOID) && IsTileType(t, MP_WATER) == water) best_dist = dist;
} else {
/* When the Y distance between the current row and the 'source' tile
* is larger than the best distance, we've found the best distance */