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 /crawl-ref/source/maps.cc | |
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
Diffstat (limited to 'crawl-ref/source/maps.cc')
-rw-r--r-- | crawl-ref/source/maps.cc | 2 |
1 files changed, 2 insertions, 0 deletions
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); |