diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-10-06 02:51:44 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-10-06 02:51:44 +0000 |
| commit | 0fb28d6c1b82e6c10e00c4cc9b946eb010d65017 (patch) | |
| tree | 1377e3e61587069330bf28359a7a871723a458bf /crawl-ref/source/spells1.cc | |
| parent | 967e9e7bb84c639c1e5065c6a65a05972dbc88c5 (diff) | |
| download | crawl-ref-0fb28d6c1b82e6c10e00c4cc9b946eb010d65017.tar.gz crawl-ref-0fb28d6c1b82e6c10e00c4cc9b946eb010d65017.zip | |
Expand handling of monster intelligence and zombifiability to work on
the level of individual monsters.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7148 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/spells1.cc')
| -rw-r--r-- | crawl-ref/source/spells1.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/spells1.cc b/crawl-ref/source/spells1.cc index 4666e8f176..56a49cff5c 100644 --- a/crawl-ref/source/spells1.cc +++ b/crawl-ref/source/spells1.cc @@ -652,7 +652,7 @@ static bool _can_pacify_monster(const monsters *mon, const int healed) // I was thinking of jellies when I wrote this, but maybe we shouldn't // exclude zombies and such... (jpeg) - if (mons_intel(mon->type) <= I_PLANT) // no self-awareness + if (mons_intel(mon) <= I_PLANT) // no self-awareness return (false); const mon_holy_type holiness = mons_holiness(mon); @@ -671,7 +671,7 @@ static bool _can_pacify_monster(const monsters *mon, const int healed) if (mons_is_sleeping(mon)) // not aware of what is happening return (false); - const int factor = (mons_intel(mon->type) <= I_ANIMAL) ? 3 : // animals + const int factor = (mons_intel(mon) <= I_ANIMAL) ? 3 : // animals (is_player_same_species(mon->type)) ? 2 // same species : 1; // other |