diff options
| author | Vsevolod Kozlov <zaba@thorium.homeunix.org> | 2009-11-07 12:34:50 +0300 |
|---|---|---|
| committer | Jude Brown <bookofjude@users.sourceforge.net> | 2009-11-07 19:52:54 +1000 |
| commit | ef68100a9c4b18e9dd8b77413d3408b64f756f91 (patch) | |
| tree | e35424b6335bfab82d5dc729132769c122c6c978 /crawl-ref/source/mon-util.cc | |
| parent | 3232b4719ebfaccae12c628b01c6ca37ad38254e (diff) | |
| download | crawl-ref-ef68100a9c4b18e9dd8b77413d3408b64f756f91.tar.gz crawl-ref-ef68100a9c4b18e9dd8b77413d3408b64f756f91.zip | |
Replace mons_good_neutral with monsters::good_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, 2 insertions, 7 deletions
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index c3647ef44d..1baade33c6 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -1974,11 +1974,6 @@ int mons_base_damage_brand(const monsters *m) return (SPWPN_NORMAL); } -bool mons_good_neutral(const monsters *m) -{ - return (m->attitude == ATT_GOOD_NEUTRAL); -} - bool mons_strict_neutral(const monsters *m) { return (m->attitude == ATT_STRICT_NEUTRAL); @@ -1991,7 +1986,7 @@ bool mons_is_pacified(const monsters *m) bool mons_wont_attack(const monsters *m) { - return (m->friendly() || mons_good_neutral(m) || mons_strict_neutral(m)); + return (m->friendly() || m->good_neutral() || mons_strict_neutral(m)); } bool mons_att_wont_attack(mon_attitude_type fr) @@ -2003,7 +1998,7 @@ mon_attitude_type mons_attitude(const monsters *m) { if (m->friendly()) return ATT_FRIENDLY; - else if (mons_good_neutral(m)) + else if (m->good_neutral()) return ATT_GOOD_NEUTRAL; else if (mons_strict_neutral(m)) return ATT_STRICT_NEUTRAL; |