summaryrefslogtreecommitdiff
path: root/src/settings.cpp
diff options
context:
space:
mode:
authorsmatz <smatz@openttd.org>2011-04-07 15:58:21 +0000
committersmatz <smatz@openttd.org>2011-04-07 15:58:21 +0000
commitb5e132924ef0993af82ed818eeed88534d4445b0 (patch)
tree323a57fe016e317adfce5d90cc5ae1b774e02d37 /src/settings.cpp
parenta8862eb77f0c87c970326d53aa1e03bb1f0920de (diff)
downloadopenttd-b5e132924ef0993af82ed818eeed88534d4445b0.tar.xz
(svn r22298) -Change: allow enabling 'freeform edges' setting when there is only station label above one of northern tiles
Diffstat (limited to 'src/settings.cpp')
-rw-r--r--src/settings.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/settings.cpp b/src/settings.cpp
index ad93ce6ea..38101e71d 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -1079,8 +1079,8 @@ static bool CheckFreeformEdges(int32 p1)
}
BaseStation *st;
FOR_ALL_BASE_STATIONS(st) {
- /* Check if there is a buoy on the northern border. */
- if (TileX(st->xy) == 0 || TileY(st->xy) == 0) {
+ /* Check if there is a non-deleted buoy on the northern border. */
+ if (st->IsInUse() && (TileX(st->xy) == 0 || TileY(st->xy) == 0)) {
ShowErrorMessage(STR_CONFIG_SETTING_EDGES_NOT_EMPTY, INVALID_STRING_ID, WL_ERROR);
return false;
}