From fcff9e79e225d1e6e37a1ac582ba67ce13983c2b Mon Sep 17 00:00:00 2001
From: yexo <yexo@openttd.org>
Date: Sun, 15 Mar 2009 21:49:37 +0000
Subject: (svn r15733) -Fix: Enabling freeform edges could cause submarines to
 get stuck on land tiles.

---
 src/disaster_cmd.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/disaster_cmd.cpp b/src/disaster_cmd.cpp
index 8f03584b3..98cfe8692 100644
--- a/src/disaster_cmd.cpp
+++ b/src/disaster_cmd.cpp
@@ -889,8 +889,10 @@ static void Disaster_Submarine_Init(DisasterSubType subtype)
 		dir = DIR_NW;
 	} else {
 		y = TILE_SIZE / 2;
+		if (_settings_game.construction.freeform_edges) y += TILE_SIZE;
 		dir = DIR_SE;
 	}
+	if (!IsWaterTile(TileVirtXY(x, y))) return;
 
 	Vehicle *v = new DisasterVehicle();
 	InitializeDisasterVehicle(v, x, y, 0, dir, subtype);
-- 
cgit v1.2.3-54-g00ecf