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.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/crawl-ref/source/maps.cc b/crawl-ref/source/maps.cc
index 2c7060f31b..dbbabd1dab 100644
--- a/crawl-ref/source/maps.cc
+++ b/crawl-ref/source/maps.cc
@@ -21,8 +21,9 @@
#include "enum.h"
#include "files.h"
#include "message.h"
-#include "monplace.h"
#include "mapdef.h"
+#include "mon-util.h"
+#include "monplace.h"
#include "random.h"
#include "state.h"
#include "terrain.h"
@@ -228,8 +229,8 @@ static bool _safe_vault_place(const map_def &map,
if (!_may_overwrite_feature(dfeat, water_ok))
return (false);
- // Don't overwrite items or monsters, either!
- if (igrd(cp) != NON_ITEM || mgrd(cp) != NON_MONSTER)
+ // Don't overwrite monsters or items, either!
+ if (monster_at(cp) || igrd(cp) != NON_ITEM)
return (false);
}