summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/behold.cc
diff options
context:
space:
mode:
authorRobert Vollmert <rvollmert@gmx.net>2009-11-05 23:10:14 +0100
committerRobert Vollmert <rvollmert@gmx.net>2009-11-05 23:10:14 +0100
commitb11642c2114307bb2cb26cfdcc09707d5f390fc2 (patch)
treeaf53de534a56533b2607201e6ef58a2c06c5dace /crawl-ref/source/behold.cc
parente09a3173a9b2d934f8c095f145fdc0b90bd3f202 (diff)
downloadcrawl-ref-b11642c2114307bb2cb26cfdcc09707d5f390fc2.tar.gz
crawl-ref-b11642c2114307bb2cb26cfdcc09707d5f390fc2.zip
Restore genus check in beholder update.
Diffstat (limited to 'crawl-ref/source/behold.cc')
-rw-r--r--crawl-ref/source/behold.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/behold.cc b/crawl-ref/source/behold.cc
index 553c044410..8d76fe9d21 100644
--- a/crawl-ref/source/behold.cc
+++ b/crawl-ref/source/behold.cc
@@ -164,7 +164,8 @@ bool player::_possible_beholder(const monsters *mon) const
return (false);
if (silenced(you.pos()))
return (false);
- if (!mon->alive() || !mons_near(mon) || mons_friendly(mon)
+ if (!mon->alive() || mons_genus(mon->type) != MONS_MERMAID
+ || !mons_near(mon) || mons_friendly(mon)
|| mon->submerged() || mon->confused() || mons_cannot_move(mon)
|| mon->asleep() || silenced(mon->pos()))
{