diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-29 01:27:12 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-29 01:27:12 +0000 |
| commit | 3db4ce1528552446a4528749eebea4480da16387 (patch) | |
| tree | 0a48f1c0e3ad2c4312a2265612437858560147b6 /crawl-ref/source/monstuff.cc | |
| parent | dd3572ee43e82c41212e7b05cf76a2a513efd9b2 (diff) | |
| download | crawl-ref-3db4ce1528552446a4528749eebea4480da16387.tar.gz crawl-ref-3db4ce1528552446a4528749eebea4480da16387.zip | |
Fix ME_ALERT handling for pacified monsters.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6192 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/monstuff.cc')
| -rw-r--r-- | crawl-ref/source/monstuff.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index 1487a5f859..6b5d0ae9b2 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -2032,11 +2032,8 @@ void behaviour_event(monsters *mon, int event, int src, break; case ME_ALERT: - if ((mons_friendly(mon) || mons_is_pacified(mon)) - && mon->is_patrolling()) - { + if (mons_friendly(mon) && mon->is_patrolling()) break; - } // Will alert monster to <src> and turn them // against them, unless they have a current foe. |