diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-07-29 17:10:16 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-07-29 17:10:16 +0000 |
| commit | 199d107c9f40413126a31fcc843f5c54608bc73c (patch) | |
| tree | 444c9eb8c251d8d365e542e6cbbf3a8fd387138d /crawl-ref/source/maps.cc | |
| parent | 1fef821214bcc2300fd2346c05cffb1b800104c5 (diff) | |
| download | crawl-ref-199d107c9f40413126a31fcc843f5c54608bc73c.tar.gz crawl-ref-199d107c9f40413126a31fcc843f5c54608bc73c.zip | |
&L can place encompass levels, and is more aggressive about overwriting
existing dungeon features. Dungeon features of importance - such as stairs,
shops, and altars - and map markers are shifted out of the way, to the nearest
free floor square.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1947 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/maps.cc')
| -rw-r--r-- | crawl-ref/source/maps.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/crawl-ref/source/maps.cc b/crawl-ref/source/maps.cc index 8599c2efe2..859e6fe211 100644 --- a/crawl-ref/source/maps.cc +++ b/crawl-ref/source/maps.cc @@ -161,7 +161,7 @@ static bool bad_map_place(const map_def &map, int sx, int sy, int width, int height, bool check_place, bool clobber) { - if (!check_place) + if (!check_place || clobber) return (false); const std::vector<std::string> &lines = map.map.get_lines(); @@ -175,8 +175,7 @@ static bool bad_map_place(const map_def &map, if (dgn_map_mask[x][y]) return (true); - if (!clobber - && (igrd[x][y] != NON_ITEM || mgrd[x][y] != NON_MONSTER)) + if (igrd[x][y] != NON_ITEM || mgrd[x][y] != NON_MONSTER) return (true); const dungeon_feature_type grid = grd[x][y]; |