diff options
| -rw-r--r-- | crawl-ref/source/dungeon.cc | 19 | ||||
| -rw-r--r-- | crawl-ref/source/maps.cc | 1 |
2 files changed, 13 insertions, 7 deletions
diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc index 176fa6f714..b1e8ca5301 100644 --- a/crawl-ref/source/dungeon.cc +++ b/crawl-ref/source/dungeon.cc @@ -678,17 +678,22 @@ static void dgn_verify_connectivity(unsigned nvaults) if (!dgn_level_vetoed && dgn_zones && nvaults != level_vaults.size()) { const int newzones = dgn_count_disconnected_zones(); + +#ifdef DEBUG_DIAGNOSTICS + std::ostringstream vlist; + for (unsigned i = nvaults; i < level_vaults.size(); ++i) + { + if (i > nvaults) + vlist << ", "; + vlist << level_vaults[i].map.name; + } + mprf(MSGCH_DIAGNOSTICS, "Dungeon has %d zones after placing %s.", + newzones, vlist.str().c_str()); +#endif if (newzones > dgn_zones) { dgn_level_vetoed = true; #ifdef DEBUG_DIAGNOSTICS - std::ostringstream vlist; - for (unsigned i = nvaults; i < level_vaults.size(); ++i) - { - if (i > nvaults) - vlist << ", "; - vlist << level_vaults[i].map.name; - } mprf(MSGCH_DIAGNOSTICS, "VETO: %s broken by [%s] (had %d zones, " "now have %d zones.", diff --git a/crawl-ref/source/maps.cc b/crawl-ref/source/maps.cc index e8a1514296..4cecac9884 100644 --- a/crawl-ref/source/maps.cc +++ b/crawl-ref/source/maps.cc @@ -349,6 +349,7 @@ int random_map_in_depth(const level_id &place, bool want_minivault) && !vdefs[i].has_tag_suffix("entry") && !vdefs[i].has_tag("pan") && !vdefs[i].has_tag("unrand") + && !vdefs[i].has_tag("bazaar") && vault_unforbidden(vdefs[i])) { rollsize += vdefs[i].chance; |