diff options
| author | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-02 08:48:31 +0000 |
|---|---|---|
| committer | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-02 08:48:31 +0000 |
| commit | 64c8bcacb7d1797279b74bf39cac71b98c096be4 (patch) | |
| tree | 62b0d7c6f2867a76bd27c730f76f819b568a6b03 /crawl-ref/source | |
| parent | fd9dab19ca3712e97b7c0a67cfc53d10da81018a (diff) | |
| download | crawl-ref-64c8bcacb7d1797279b74bf39cac71b98c096be4.tar.gz crawl-ref-64c8bcacb7d1797279b74bf39cac71b98c096be4.zip | |
Mermaids and sirens shouldn't mesmerise the player during arena mode.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8109 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source')
| -rw-r--r-- | crawl-ref/source/monstuff.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index bc0f32ee84..86a37415d0 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -5199,6 +5199,10 @@ static bool _handle_special_ability(monsters *monster, bolt & beem) case MONS_MERMAID: case MONS_SIREN: { + // Don't behold observer in the arena. + if (crawl_state.arena) + break; + // Don't behold player already half down or up the stairs. if (!you.delay_queue.empty()) { |