summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/maps.cc
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source/maps.cc')
-rw-r--r--crawl-ref/source/maps.cc5
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];