diff options
| author | Neil Moore <neil@s-z.org> | 2014-07-27 02:36:38 -0400 |
|---|---|---|
| committer | Neil Moore <neil@s-z.org> | 2014-07-27 02:36:52 -0400 |
| commit | a5df18ca803b81704a677b71ba89aecc3a0241a1 (patch) | |
| tree | 7000312f56576cf23ab5ba9a2a44025e5aab28fe /crawl-ref/source/dungeon.cc | |
| parent | 456eec362be76bada65f826b9fd9560da57723f1 (diff) | |
| download | crawl-ref-a5df18ca803b81704a677b71ba89aecc3a0241a1.tar.gz crawl-ref-a5df18ca803b81704a677b71ba89aecc3a0241a1.zip | |
Don't veto every O/S/M/A level with a primary vault.
Diffstat (limited to 'crawl-ref/source/dungeon.cc')
| -rw-r--r-- | crawl-ref/source/dungeon.cc | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc index 58034e58fc..7e0a8d06ee 100644 --- a/crawl-ref/source/dungeon.cc +++ b/crawl-ref/source/dungeon.cc @@ -6877,17 +6877,13 @@ int vault_placement::connect(bool spotty) const for (vector<coord_def>::const_iterator i = exits.begin(); i != exits.end(); ++i) { - if (spotty && _connect_spotty(*i, _feat_is_wall_floor_liquid)) - continue; - - if (player_in_branch(BRANCH_SHOALS) && - dgn_shoals_connect_point(*i, _feat_is_wall_floor_liquid)) + if (spotty && _connect_spotty(*i, _feat_is_wall_floor_liquid) + || player_in_branch(BRANCH_SHOALS) + && dgn_shoals_connect_point(*i, _feat_is_wall_floor_liquid) + || _connect_vault_exit(*i)) { - continue; - } - - if (_connect_vault_exit(*i)) exits_placed++; + } else dprf("Warning: failed to connect vault exit (%d;%d).", i->x, i->y); } |