diff options
| author | Vsevolod Kozlov <zaba@thorium.homeunix.org> | 2009-11-07 12:33:40 +0300 |
|---|---|---|
| committer | Jude Brown <bookofjude@users.sourceforge.net> | 2009-11-07 19:52:53 +1000 |
| commit | 3232b4719ebfaccae12c628b01c6ca37ad38254e (patch) | |
| tree | e95548b672dddc54a27c8fe3124809a82ef0b914 /crawl-ref/source/mon-util.cc | |
| parent | 19c21942c0fd98b8034920f9bebd96bc8a8a5261 (diff) | |
| download | crawl-ref-3232b4719ebfaccae12c628b01c6ca37ad38254e.tar.gz crawl-ref-3232b4719ebfaccae12c628b01c6ca37ad38254e.zip | |
Replace mons_neutral with monsters::neutral.
Signed-off-by: Jude Brown <bookofjude@users.sourceforge.net>
Diffstat (limited to 'crawl-ref/source/mon-util.cc')
| -rw-r--r-- | crawl-ref/source/mon-util.cc | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index 6383fef27c..c3647ef44d 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -1974,13 +1974,6 @@ int mons_base_damage_brand(const monsters *m) return (SPWPN_NORMAL); } -bool mons_neutral(const monsters *m) -{ - return (m->attitude == ATT_NEUTRAL || m->has_ench(ENCH_NEUTRAL) - || m->attitude == ATT_GOOD_NEUTRAL - || m->attitude == ATT_STRICT_NEUTRAL); -} - bool mons_good_neutral(const monsters *m) { return (m->attitude == ATT_GOOD_NEUTRAL); @@ -2014,7 +2007,7 @@ mon_attitude_type mons_attitude(const monsters *m) return ATT_GOOD_NEUTRAL; else if (mons_strict_neutral(m)) return ATT_STRICT_NEUTRAL; - else if (mons_neutral(m)) + else if (m->neutral()) return ATT_NEUTRAL; else return ATT_HOSTILE; |