diff options
| author | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-05 12:57:13 -0600 |
|---|---|---|
| committer | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-05 12:57:13 -0600 |
| commit | 51ded013829b4cd8f73fa7f6313e73d2f7550aa5 (patch) | |
| tree | 58a2f3973efdd6fb016f3ab7a3a71809d0d888d0 /crawl-ref/source/maps.cc | |
| parent | 418a2664a3de915971c847d9fb16e93bc263661e (diff) | |
| download | crawl-ref-51ded013829b4cd8f73fa7f6313e73d2f7550aa5.tar.gz crawl-ref-51ded013829b4cd8f73fa7f6313e73d2f7550aa5.zip | |
Make many checks for monster (non)existence on squares use monster_at().
Not all are changed yet, as there are several index checks still needed
for debugging purposes.
Also, make many checks for player/monster (non)existence use actor_at().
Diffstat (limited to 'crawl-ref/source/maps.cc')
| -rw-r--r-- | crawl-ref/source/maps.cc | 7 |
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); } |