Merge pull request #4782 from Olegmods/develop

Ship obstacles fix

config/battlefields.json

@@ -162,5 +162,5 @@
 			159, 160, 161, 162, 163,
 			176, 177, 178, 179, 180]
 	},
-	"ship": { "graphics" : "CMBKDECK.BMP" }
+	"ship": { "graphics" : "CMBKDECK.BMP", "isSpecial" : true}
 }

config/obstacles.json

@@ -538,7 +538,7 @@
 	},
 	"55":
 	{
-		"allowedTerrains" : ["water"],
+		"specialBattlefields" : ["ship"],
 		"width" : 3,
 		"height" : 3,
 		"blockedTiles" :  [-15, -16, -33],