From a9c6a9b1e9c9055a8d1fe2e9f77cade1cfc1d834 Mon Sep 17 00:00:00 2001
From: dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>
Date: Fri, 7 Aug 2009 07:52:39 +0000
Subject: 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/trunk@10498 c06c8d41-db1a-0410-9941-cceddc491573
---
 crawl-ref/source/dat/pan.des | 22 +++++++++++-----------
 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 fb6e1b92d6..36cd3631e1 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
 SUBST: P = O..
 MAP
@@ -281,7 +281,7 @@ ENDMAP
 ###################################
 
 NAME: rand_demon_5
-TAGS: pan allow_dup mini_float
+TAGS: pan allow_dup
 MONS: pandemonium demon, any demon, any demon
 SUBST: P = O..
 MAP
@@ -302,7 +302,7 @@ ENDMAP
 ###################################
 
 NAME: rand_demon_6
-TAGS: pan allow_dup mini_float
+TAGS: pan allow_dup
 MONS: pandemonium demon, any demon, any demon
 MAP
 ............
@@ -322,7 +322,7 @@ ENDMAP
 ###################################
 
 NAME: rand_demon_7
-TAGS: pan allow_dup mini_float
+TAGS: pan allow_dup
 MONS: pandemonium demon, any demon, greater demon
 MAP
 ............
@@ -342,7 +342,7 @@ ENDMAP
 ###################################
 
 NAME: rand_demon_8
-TAGS: pan allow_dup mini_float
+TAGS: pan allow_dup
 MONS: pandemonium demon, greater demon, any demon
 MAP
 ............
@@ -362,7 +362,7 @@ ENDMAP
 ###################################
 
 NAME: rand_demon_9
-TAGS: pan allow_dup mini_float
+TAGS: pan allow_dup
 MONS: pandemonium demon, any demon, greater demon
 SUBST: P = O..
 MAP
@@ -383,7 +383,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=.
@@ -420,7 +420,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 dacf18fede..b3614b7782 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);
 
-- 
cgit v1.2.3-54-g00ecf