From ba0c7906057642dd0464f304e3afa1ad62a3c479 Mon Sep 17 00:00:00 2001 From: Matthew Cline Date: Sat, 5 Dec 2009 19:43:16 -0800 Subject: Bug #125: Pacifying mermaid -> still mesmerized If a mermaid is pacified (or otherwise changes attitude so that it won't attack the player) then it will stop mesmerizing the player. --- crawl-ref/source/behold.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'crawl-ref/source/behold.cc') diff --git a/crawl-ref/source/behold.cc b/crawl-ref/source/behold.cc index d76997a7d3..650c2f089f 100644 --- a/crawl-ref/source/behold.cc +++ b/crawl-ref/source/behold.cc @@ -164,5 +164,6 @@ bool player::_possible_beholder(const monsters *mon) const && see_cell(mon->pos()) && mon->see_cell(pos()) && mon->alive() && mons_genus(mon->type) == MONS_MERMAID && !mon->submerged() && !mon->confused() - && !mon->asleep() && !mon->cannot_move()); + && !mon->asleep() && !mon->cannot_move() + && !mon->wont_attack() && !mon->pacified()); } -- cgit v1.2.3-54-g00ecf