Replace mons_good_neutral with monsters::good_neutral.

Signed-off-by: Jude Brown <bookofjude@users.sourceforge.net>

5 files changed, 9 insertions, 9 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;
diff --git a/crawl-ref/source/mon-util.h b/crawl-ref/source/mon-util.h
index 94d1290130..ef6d9aec1d 100644
--- a/crawl-ref/source/mon-util.h
+++ b/crawl-ref/source/mon-util.h
@@ -608,7 +608,6 @@ const char *mons_pronoun(monster_type mon_type, pronoun_type variant,
 bool mons_aligned(int m1, int m2);
 bool mons_atts_aligned(mon_attitude_type fr1, mon_attitude_type fr2);
 
-bool mons_good_neutral(const monsters *m);
 bool mons_strict_neutral(const monsters *m);
 bool mons_is_pacified(const monsters *m);
 bool mons_wont_attack(const monsters *m);
diff --git a/crawl-ref/source/monster.cc b/crawl-ref/source/monster.cc
index 37a75de41a..2178e35576 100644
--- a/crawl-ref/source/monster.cc
+++ b/crawl-ref/source/monster.cc
@@ -2839,6 +2839,11 @@ bool monsters::neutral() const
             || attitude == ATT_STRICT_NEUTRAL);
 }
 
+bool monsters::good_neutral() const
+{
+    return (attitude == ATT_GOOD_NEUTRAL);
+}
+
 int monsters::shield_bonus() const
 {
     const item_def *shld = const_cast<monsters*>(this)->shield();
diff --git a/crawl-ref/source/monster.h b/crawl-ref/source/monster.h
index 2121d0bfa8..ced398812b 100644
--- a/crawl-ref/source/monster.h
+++ b/crawl-ref/source/monster.h
@@ -335,6 +335,7 @@ public:
 
     bool friendly() const;
     bool neutral() const;
+    bool good_neutral() const;
 
     bool has_spells() const;
     bool has_spell(spell_type spell) const;
diff --git a/crawl-ref/source/monstuff.h b/crawl-ref/source/monstuff.h
index b0b5b24ef6..81fe96e6e3 100644
--- a/crawl-ref/source/monstuff.h
+++ b/crawl-ref/source/monstuff.h
@@ -49,7 +49,7 @@ public:
 #define MON_KILL(x) ((x) == KILL_MON || (x) == KILL_MON_MISSILE)
 
 #define SAME_ATTITUDE(x) (x->friendly()       ? BEH_FRIENDLY : \
-                          mons_good_neutral(x)   ? BEH_GOOD_NEUTRAL : \
+                          x->good_neutral()   ? BEH_GOOD_NEUTRAL : \
                           mons_strict_neutral(x) ? BEH_STRICT_NEUTRAL : \
                           x->neutral()        ? BEH_NEUTRAL \
                                                  : BEH_HOSTILE)