Extend rectangular vault support for regular vaults.

Vault collision checking is also non-rectangular now.

Fixed Windows builds not reporting line numbers in .des file error messages.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1784 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 10 insertions, 0 deletions

diff --git a/crawl-ref/source/mapdef.cc b/crawl-ref/source/mapdef.cc
index fc6c0a62dc..4c957c3cc9 100644
--- a/crawl-ref/source/mapdef.cc
+++ b/crawl-ref/source/mapdef.cc
@@ -361,6 +361,11 @@ int map_lines::operator () (const coord_def &c) const
     return lines[c.y][c.x];
 }
 
+bool map_lines::in_map(const coord_def &c) const
+{
+    return (lines[c.y][c.x] != ' ');
+}
+
 map_lines &map_lines::operator = (const map_lines &map)
 {
     if (this != &map)
@@ -1104,6 +1109,11 @@ void map_def::reinit()
     mons.clear();
 }
 
+bool map_def::in_map(const coord_def &c) const
+{
+    return map.in_map(c);
+}
+
 int map_def::glyph_at(const coord_def &c) const
 {
     return map(c);