1 files changed, 5 insertions, 0 deletions
diff --git a/tile.h b/tile.h
index c12bf974e..e02c9e443 100644
--- a/tile.h
+++ b/tile.h
@@ -89,6 +89,11 @@ static inline TileType GetTileType(TileIndex tile)
 static inline void SetTileType(TileIndex tile, TileType type)
 {
 	assert(tile < MapSize());
+	/* Allow only MP_VOID to be set to border tiles. This code is put here since
+	 * it seems there is a bug that violates this somewhere. (Formely know as
+	 * the "old ship pf" bug, which presented a case in which this broke). It
+	 * can be removed as soon as  the bug is squashed. */
+	assert((TileX(tile) < MapMaxX() && TileY(tile) < MapMaxY()) || type == MP_VOID);
 	SB(_m[tile].type_height, 4, 4, type);
 }