From b4b8747ec41b3fa6543d7c51e02515b0cec1496f Mon Sep 17 00:00:00 2001 From: Vsevolod Kozlov Date: Fri, 6 Nov 2009 19:46:32 +0300 Subject: Move mons_is_friendly to monsters::friendly. Signed-off-by: Robert Vollmert --- crawl-ref/source/behold.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'crawl-ref/source/behold.cc') diff --git a/crawl-ref/source/behold.cc b/crawl-ref/source/behold.cc index 8d76fe9d21..bcbacace1e 100644 --- a/crawl-ref/source/behold.cc +++ b/crawl-ref/source/behold.cc @@ -165,7 +165,7 @@ bool player::_possible_beholder(const monsters *mon) const if (silenced(you.pos())) return (false); if (!mon->alive() || mons_genus(mon->type) != MONS_MERMAID - || !mons_near(mon) || mons_friendly(mon) + || !mons_near(mon) || mon->friendly() || mon->submerged() || mon->confused() || mons_cannot_move(mon) || mon->asleep() || silenced(mon->pos())) { -- cgit v1.2.3-54-g00ecf