summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/traps.cc
diff options
context:
space:
mode:
authorVsevolod Kozlov <zaba@thorium.homeunix.org>2009-11-06 19:46:32 +0300
committerRobert Vollmert <rvollmert@gmx.net>2009-11-06 19:52:58 +0100
commitb4b8747ec41b3fa6543d7c51e02515b0cec1496f (patch)
treeefb1625c80d595b58b8bde933decd1dfc674ee04 /crawl-ref/source/traps.cc
parent22adbee6a63d3fb1ee05d0e6ff41e80e95b4afc7 (diff)
downloadcrawl-ref-b4b8747ec41b3fa6543d7c51e02515b0cec1496f.tar.gz
crawl-ref-b4b8747ec41b3fa6543d7c51e02515b0cec1496f.zip
Move mons_is_friendly to monsters::friendly.
Signed-off-by: Robert Vollmert <rvollmert@gmx.net>
Diffstat (limited to 'crawl-ref/source/traps.cc')
-rw-r--r--crawl-ref/source/traps.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/traps.cc b/crawl-ref/source/traps.cc
index f5ae7076dd..97c5a0834f 100644
--- a/crawl-ref/source/traps.cc
+++ b/crawl-ref/source/traps.cc
@@ -410,7 +410,7 @@ void trap_def::trigger(actor& triggerer, bool flat_footed)
if (!you_know)
this->hide();
}
- else if (!(m && mons_friendly(m)))
+ else if (!(m && m->friendly()))
{
// Alarm traps aren't set off by hostile monsters, because
// that would be way too nasty for the player.