diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2010-07-03 23:36:08 +0200 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2010-07-03 23:36:08 +0200 |
| commit | cc4698932f9e81647aa9eedd71cb9ad207bafc89 (patch) | |
| tree | b8009a840a4d49f6b62e07a55e44628f9700a0af /crawl-ref/source/behold.cc | |
| parent | b1169be518dee560c777948047fecd718ed6e558 (diff) | |
| download | crawl-ref-cc4698932f9e81647aa9eedd71cb9ad207bafc89.tar.gz crawl-ref-cc4698932f9e81647aa9eedd71cb9ad207bafc89.zip | |
Reorder beholder checks so non-mermaids don't cause costly LOS runs.
Diffstat (limited to 'crawl-ref/source/behold.cc')
| -rw-r--r-- | crawl-ref/source/behold.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/behold.cc b/crawl-ref/source/behold.cc index e3bb3f6dc1..346329be8f 100644 --- a/crawl-ref/source/behold.cc +++ b/crawl-ref/source/behold.cc @@ -212,9 +212,9 @@ bool player::_possible_beholder(const monsters *mon) const if (crawl_state.game_is_arena()) return (false); - return (!silenced(pos()) && !silenced(mon->pos()) + return (mon->alive() && mons_genus(mon->type) == MONS_MERMAID + && !silenced(pos()) && !silenced(mon->pos()) && 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->wont_attack() && !mon->pacified() |