diff options
| author | Matthew Cline <zelgadis@sourceforge.net> | 2009-12-05 19:43:16 -0800 |
|---|---|---|
| committer | Matthew Cline <zelgadis@sourceforge.net> | 2009-12-05 20:03:57 -0800 |
| commit | ba0c7906057642dd0464f304e3afa1ad62a3c479 (patch) | |
| tree | 96ba2bac8cb36edd99637192845e873da19d2783 /crawl-ref/source/behold.cc | |
| parent | 2b926c93602f8c6f7da4276aef16fd545c340a6a (diff) | |
| download | crawl-ref-ba0c7906057642dd0464f304e3afa1ad62a3c479.tar.gz crawl-ref-ba0c7906057642dd0464f304e3afa1ad62a3c479.zip | |
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.
Diffstat (limited to 'crawl-ref/source/behold.cc')
| -rw-r--r-- | crawl-ref/source/behold.cc | 3 |
1 files changed, 2 insertions, 1 deletions
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()); } |