diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-29 05:22:46 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-29 05:22:46 +0000 |
| commit | 2d8ce0a2ef76abb530cdfd8e4c126c7249e6b19d (patch) | |
| tree | eb445c79521647be9c65bf356b5dd29bf0ec2cd3 /crawl-ref | |
| parent | 38bdc5540aa2b0d07f936a54114b4a0f1fd4f554 (diff) | |
| download | crawl-ref-2d8ce0a2ef76abb530cdfd8e4c126c7249e6b19d.tar.gz crawl-ref-2d8ce0a2ef76abb530cdfd8e4c126c7249e6b19d.zip | |
Simplify.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6207 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
| -rw-r--r-- | crawl-ref/source/monstuff.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index 554395e427..2c9ddee6fd 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -5045,13 +5045,10 @@ static bool _handle_spell(monsters *monster, bolt &beem) bool finalAnswer = false; // as in: "Is that your...?" {dlb} const spell_type draco_breath = _get_draconian_breath_spell(monster); - if (is_sanctuary(monster->x, monster->y)) + if (is_sanctuary(monster->x, monster->y) + && !mons_wont_attack(monster)) { - if (!mons_friendly(monster) - && !mons_good_neutral(monster)) - { - return (false); - } + return (false); } // Yes, there is a logic to this ordering {dlb}: |