diff options
author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-07-07 15:28:06 +0000 |
---|---|---|
committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-07-07 15:28:06 +0000 |
commit | c25973abd006dc9584efc3ce3538758b30cf3a2a (patch) | |
tree | 573598a46d696ef31a20a486e92d5868ec15ed13 /crawl-ref/source/maps.cc | |
parent | 17b7bb3e2bab6f05a2e3000b11896f3987ed5a80 (diff) | |
download | crawl-ref-c25973abd006dc9584efc3ce3538758b30cf3a2a.tar.gz crawl-ref-c25973abd006dc9584efc3ce3538758b30cf3a2a.zip |
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
Diffstat (limited to 'crawl-ref/source/maps.cc')
-rw-r--r-- | crawl-ref/source/maps.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/maps.cc b/crawl-ref/source/maps.cc index be6aa2f249..15d6bf5913 100644 --- a/crawl-ref/source/maps.cc +++ b/crawl-ref/source/maps.cc @@ -192,7 +192,7 @@ static bool bad_map_place(const map_def &map, const vault_placement &vp = (*avoid)[i]; const dgn_region vault(vp.x, vp.y, vp.width, vp.height); - if (thisvault.overlaps(vault)) + if (thisvault.overlaps(vault) && thisvault.overlaps(dgn_map_mask)) return (true); } |