summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/mon-abil.cc
diff options
context:
space:
mode:
authorDavid Lawrence Ramsey <dolorous@users.sourceforge.net>2009-11-05 12:57:13 -0600
committerDavid Lawrence Ramsey <dolorous@users.sourceforge.net>2009-11-05 12:57:13 -0600
commit51ded013829b4cd8f73fa7f6313e73d2f7550aa5 (patch)
tree58a2f3973efdd6fb016f3ab7a3a71809d0d888d0 /crawl-ref/source/mon-abil.cc
parent418a2664a3de915971c847d9fb16e93bc263661e (diff)
downloadcrawl-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/mon-abil.cc')
-rw-r--r--crawl-ref/source/mon-abil.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/mon-abil.cc b/crawl-ref/source/mon-abil.cc
index 094e64abef..1742d00860 100644
--- a/crawl-ref/source/mon-abil.cc
+++ b/crawl-ref/source/mon-abil.cc
@@ -501,7 +501,7 @@ static bool _siren_movement_effect(const monsters *monster)
if (swapping)
{
- if (mgrd(oldpos) != NON_MONSTER)
+ if (monster_at(oldpos))
{
mprf("Something prevents you from swapping places "
"with %s.",