diff options
author | Darshan Shaligram <dshaligram@users.sourceforge.net> | 2009-12-30 08:24:00 +0530 |
---|---|---|
committer | Darshan Shaligram <dshaligram@users.sourceforge.net> | 2009-12-30 08:24:00 +0530 |
commit | 6f40e4499e2e8057d7ff2476faec45d186daadfe (patch) | |
tree | 181a109b00ab67af0829666247683956fa5b6c90 /crawl-ref/source/dgn-shoals.cc | |
parent | 82c047ea3c235d96a008e5730eabcb12f31a7aec (diff) | |
download | crawl-ref-6f40e4499e2e8057d7ff2476faec45d186daadfe.tar.gz crawl-ref-6f40e4499e2e8057d7ff2476faec45d186daadfe.zip |
Remove shoal decoy huts. The rune huts are now also used as decoys, with the rune replaced by |
Diffstat (limited to 'crawl-ref/source/dgn-shoals.cc')
-rw-r--r-- | crawl-ref/source/dgn-shoals.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/crawl-ref/source/dgn-shoals.cc b/crawl-ref/source/dgn-shoals.cc index f48a146266..367ca497d4 100644 --- a/crawl-ref/source/dgn-shoals.cc +++ b/crawl-ref/source/dgn-shoals.cc @@ -407,11 +407,15 @@ static void _shoals_furniture(int margin) const int nhuts = std::min(8, int(_shoals_islands.size())); for (int i = 2; i < nhuts; ++i) { - // Place (non-rune) minivaults on the other islands + // Place (non-rune) minivaults on the other islands. We + // reuse the shoal rune huts, but do not place the rune + // again. + int tries = 5; do - vault = random_map_for_tag("shoal"); - while (!vault); - dgn_place_map(vault, false, true, _pick_shoals_island()); + vault = random_map_for_tag("shoal_rune"); + while (!vault && --tries > 0); + if (vault) + dgn_place_map(vault, false, true, _pick_shoals_island(), 0); } } else |