summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/maps.cc
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-07-08 16:33:55 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-07-08 16:33:55 +0000
commit64eb39919e167b9443b88943bbf0e1f3ba63f61c (patch)
treec67a5ae6aac361ea08445aef0773c74bcab99e28 /crawl-ref/source/maps.cc
parent3e5eae658a2dd7acbd5584f4a6104ba99e7de275 (diff)
downloadcrawl-ref-64eb39919e167b9443b88943bbf0e1f3ba63f61c.tar.gz
crawl-ref-64eb39919e167b9443b88943bbf0e1f3ba63f61c.zip
Fixed inappropriate maps being selected for dungeon levels.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1803 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/maps.cc')
-rw-r--r--crawl-ref/source/maps.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/crawl-ref/source/maps.cc b/crawl-ref/source/maps.cc
index 73dc38c0ad..d2d63f6eef 100644
--- a/crawl-ref/source/maps.cc
+++ b/crawl-ref/source/maps.cc
@@ -312,12 +312,14 @@ int random_map_in_depth(const level_id &place, bool want_minivault)
for (unsigned i = 0, size = vdefs.size(); i < size; ++i)
if (vdefs[i].is_minivault() == want_minivault
+ && !vdefs[i].place.is_valid()
&& vdefs[i].is_usable_in(place)
- // Tagged levels cannot be selected by depth. This is
+ // Some tagged levels cannot be selected by depth. This is
// the only thing preventing Pandemonium demon vaults from
// showing up in the main dungeon.
- && !vdefs[i].has_tag("entry")
- && !vdefs[i].has_tag("pan"))
+ && !vdefs[i].has_tag_suffix("entry")
+ && !vdefs[i].has_tag("pan")
+ && !vdefs[i].has_tag("unrand"))
{
rollsize += vdefs[i].chance;