diff options
| author | evktalo <evktalo@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-08-09 11:22:07 +0000 |
|---|---|---|
| committer | evktalo <evktalo@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-08-09 11:22:07 +0000 |
| commit | 81d40689f0a2d24665190769f1e2332c58e84cd4 (patch) | |
| tree | a85a5456c928e4fe0e86b65f6ce42db15f368eb1 | |
| parent | cf641d2460a15d401e0eeecd062ed1e7acfb4372 (diff) | |
| download | crawl-ref-81d40689f0a2d24665190769f1e2332c58e84cd4.tar.gz crawl-ref-81d40689f0a2d24665190769f1e2332c58e84cd4.zip | |
Merge r10498 to 0.5, reverting r10489: Fix broken minivault placement guarantee: minivaults could be placed without overlapping existing floor squares.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.5@10505 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/dat/pan.des | 22 | ||||
| -rw-r--r-- | crawl-ref/source/maps.cc | 2 |
2 files changed, 13 insertions, 11 deletions
diff --git a/crawl-ref/source/dat/pan.des b/crawl-ref/source/dat/pan.des index f71d07d0a1..622f0b1839 100644 --- a/crawl-ref/source/dat/pan.des +++ b/crawl-ref/source/dat/pan.des @@ -199,7 +199,7 @@ ENDMAP # dungeon. NAME: rand_demon_1 -TAGS: pan allow_dup mini_float +TAGS: pan allow_dup MONS: pandemonium demon, random, random, random, random, random MAP ............ @@ -219,7 +219,7 @@ ENDMAP ################################### NAME: rand_demon_2 -TAGS: pan allow_dup mini_float +TAGS: pan allow_dup MONS: pandemonium demon, greater demon, common demon MONS: common demon, random, random MAP @@ -240,7 +240,7 @@ ENDMAP ################################### NAME: rand_demon_3 -TAGS: pan allow_dup mini_float +TAGS: pan allow_dup MONS: pandemonium demon, common demon, common demon MAP ............ @@ -260,7 +260,7 @@ ENDMAP ################################### NAME: rand_demon_4 -TAGS: pan allow_dup mini_float +TAGS: pan allow_dup MONS: pandemonium demon, any demon, any demon MAP ............ @@ -280,7 +280,7 @@ ENDMAP ################################### NAME: rand_demon_5 -TAGS: pan allow_dup mini_float +TAGS: pan allow_dup MONS: pandemonium demon, any demon, any demon MAP ............ @@ -300,7 +300,7 @@ ENDMAP ################################### NAME: rand_demon_6 -TAGS: pan allow_dup mini_float +TAGS: pan allow_dup MONS: pandemonium demon, any demon, any demon MAP ............ @@ -320,7 +320,7 @@ ENDMAP ################################### NAME: rand_demon_7 -TAGS: pan allow_dup mini_float +TAGS: pan allow_dup MONS: pandemonium demon, any demon, greater demon MAP ............ @@ -340,7 +340,7 @@ ENDMAP ################################### NAME: rand_demon_8 -TAGS: pan allow_dup mini_float +TAGS: pan allow_dup MONS: pandemonium demon, greater demon, any demon MAP ............ @@ -360,7 +360,7 @@ ENDMAP ################################### NAME: rand_demon_9 -TAGS: pan allow_dup mini_float +TAGS: pan allow_dup MONS: pandemonium demon, any demon, greater demon MAP ............ @@ -380,7 +380,7 @@ ENDMAP ################################### NAME: lemuel_draining_boxes -TAGS: pan mini_float +TAGS: pan MONS: pandemonium demon, eye of draining, any demon SHUFFLE: aA/bB/cC/dD/eE/fF, eE/gG, fF/hH SUBST: a=m, b=m, c=m, d=m, e=m, f=m, g=., h=. @@ -417,7 +417,7 @@ ENDMAP ################################### NAME: lemuel_hellion_island -TAGS: pan mini_float +TAGS: pan MONS: pandemonium demon, hellion SUBST: L=l. MAP diff --git a/crawl-ref/source/maps.cc b/crawl-ref/source/maps.cc index d24790f89f..dcf92253d1 100644 --- a/crawl-ref/source/maps.cc +++ b/crawl-ref/source/maps.cc @@ -106,6 +106,8 @@ static int write_vault(map_def &mdef, if (!resolve_map(place.map)) continue; + // Must set size here, or minivaults will not be placed correctly. + place.size = place.map.size(); place.orient = apply_vault_definition(place.map, place, check_place); |