Rename functions (|amethyst).

11 files changed, 21 insertions, 21 deletions

diff --git a/crawl-ref/source/actor.h b/crawl-ref/source/actor.h
index 48ce6a7620..edbf24c717 100644
--- a/crawl-ref/source/actor.h
+++ b/crawl-ref/source/actor.h
@@ -275,7 +275,7 @@ public:
     virtual bool is_holy(bool spells = true) const = 0;
     virtual bool is_unholy(bool spells = true) const = 0;
     virtual bool is_evil(bool spells = true) const = 0;
-    virtual int chaos(bool check_spells_god = false) const = 0;
+    virtual int  how_chaotic(bool check_spells_god = false) const = 0;
     virtual bool is_artificial() const = 0;
     virtual bool is_unbreathing() const = 0;
     virtual bool is_insubstantial() const = 0;
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index 87a047ef6e..c4d8a1dd57 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -2148,7 +2148,7 @@ bool curare_actor(actor* source, actor* target, int levels, string name,
 int silver_damages_victim(actor* victim, int damage, string &dmg_msg)
 {
     int ret = 0;
-    if (victim->chaos()
+    if (victim->how_chaotic()
         || victim->is_player() && player_is_shapechanged())
     {
         ret = damage * 3 / 4;
diff --git a/crawl-ref/source/dactions.cc b/crawl-ref/source/dactions.cc
index 43ee0a4233..6ce4dfa885 100644
--- a/crawl-ref/source/dactions.cc
+++ b/crawl-ref/source/dactions.cc
@@ -85,7 +85,7 @@ bool mons_matches_daction(const monster* mon, daction_type act)
     case DACT_ALLY_UNHOLY_EVIL:
         return mon->wont_attack() && (mon->is_unholy() || mon->is_evil());
     case DACT_ALLY_UNCLEAN_CHAOTIC:
-        return mon->wont_attack() && (mon->unclean() || mon->chaos());
+        return mon->wont_attack() && (mon->how_unclean() || mon->how_chaotic());
     case DACT_ALLY_SPELLCASTER:
         return mon->wont_attack() && mon->is_actual_spellcaster();
     case DACT_ALLY_YRED_SLAVE:
diff --git a/crawl-ref/source/godabil.cc b/crawl-ref/source/godabil.cc
index fd948667ff..d1da3e6d75 100644
--- a/crawl-ref/source/godabil.cc
+++ b/crawl-ref/source/godabil.cc
@@ -512,11 +512,11 @@ static int _zin_check_recite_to_single_monster(const monster *mon,
     eligibility.init(0);
 
     // Anti-chaos prayer: Hits things vulnerable to silver, or with chaotic spells/gods.
-    eligibility[RECITE_CHAOTIC] = mon->chaos(true);
+    eligibility[RECITE_CHAOTIC] = mon->how_chaotic(true);
 
     // Anti-impure prayer: Hits things that Zin hates in general.
     // Don't look at the monster's god; that's what RECITE_HERETIC is for.
-    eligibility[RECITE_IMPURE] = mon->unclean(false);
+    eligibility[RECITE_IMPURE] = mon->how_unclean(false);
     // Sanity check: if a monster is 'really' natural, don't consider it impure.
     if (mons_intel(mon) < I_NORMAL
         && (holiness == MH_NATURAL || holiness == MH_PLANT)
diff --git a/crawl-ref/source/mon-death.cc b/crawl-ref/source/mon-death.cc
index 30b3703ed4..2d9ac48075 100644
--- a/crawl-ref/source/mon-death.cc
+++ b/crawl-ref/source/mon-death.cc
@@ -1922,12 +1922,12 @@ int monster_die(monster* mons, killer_type killer,
                 }
 
                 // Zin hates unclean and chaotic beings.
-                if (mons->unclean())
+                if (mons->how_unclean())
                 {
                     did_god_conduct(DID_KILL_UNCLEAN,
                                     mons->hit_dice, true, mons);
                 }
-                else if (mons->chaos())
+                else if (mons->how_chaotic())
                 {
                     did_god_conduct(DID_KILL_CHAOTIC,
                                     mons->hit_dice, true, mons);
@@ -2157,13 +2157,13 @@ int monster_die(monster* mons, killer_type killer,
                                 mons->hit_dice);
                         }
 
-                        if (mons->unclean())
+                        if (mons->how_unclean())
                         {
                             did_god_conduct(DID_UNCLEAN_KILLED_BY_SERVANT,
                                             mons->hit_dice);
                         }
 
-                        if (mons->chaos())
+                        if (mons->how_chaotic())
                         {
                             did_god_conduct(DID_CHAOTIC_KILLED_BY_SERVANT,
                                             mons->hit_dice);
@@ -2216,13 +2216,13 @@ int monster_die(monster* mons, killer_type killer,
                                         mons->hit_dice);
                     }
 
-                    if (mons->unclean())
+                    if (mons->how_unclean())
                     {
                         did_god_conduct(DID_UNCLEAN_KILLED_BY_SERVANT,
                                         mons->hit_dice);
                     }
 
-                    if (mons->chaos())
+                    if (mons->how_chaotic())
                     {
                         did_god_conduct(DID_CHAOTIC_KILLED_BY_SERVANT,
                                         mons->hit_dice);
diff --git a/crawl-ref/source/mon-ench.cc b/crawl-ref/source/mon-ench.cc
index 15a34ff6ca..6e373e9eb3 100644
--- a/crawl-ref/source/mon-ench.cc
+++ b/crawl-ref/source/mon-ench.cc
@@ -1751,7 +1751,7 @@ void monster::apply_enchantment(const mon_enchant &me)
     // This is like Corona, but if silver harms them, it has sticky
     // flame levels of damage.
     case ENCH_SILVER_CORONA:
-        if (chaos())
+        if (how_chaotic())
         {
             int dam = roll_dice(2, 4) - 1;
             simple_monster_message(this, " is seared!");
diff --git a/crawl-ref/source/mon-place.cc b/crawl-ref/source/mon-place.cc
index fa54ba7827..30dc1a73e1 100644
--- a/crawl-ref/source/mon-place.cc
+++ b/crawl-ref/source/mon-place.cc
@@ -3776,9 +3776,9 @@ conduct_type player_will_anger_monster(monster* mon)
         return DID_HOLY;
     if (you_worship(GOD_ZIN))
     {
-        if (mon->unclean())
+        if (mon->how_unclean())
             return DID_UNCLEAN;
-        if (mon->chaos())
+        if (mon->how_chaotic())
             return DID_CHAOS;
     }
     if (you_worship(GOD_TROG) && mon->is_actual_spellcaster())
diff --git a/crawl-ref/source/monster.cc b/crawl-ref/source/monster.cc
index d97ea95bbc..1e17a5a2e3 100644
--- a/crawl-ref/source/monster.cc
+++ b/crawl-ref/source/monster.cc
@@ -3485,7 +3485,7 @@ bool monster::is_insane() const
  *  @param check_god whether the monster having a chaotic god matters.
  *  @returns 0 if not hated, a number greater than 0 otherwise.
  */
-int monster::unclean(bool check_god) const
+int monster::how_unclean(bool check_god) const
 {
     int uncleanliness = 0;
 
@@ -3528,7 +3528,7 @@ int monster::unclean(bool check_god) const
         uncleanliness++;
 
     corpse_effect_type ce = mons_corpse_effect(type);
-    if ((ce == CE_ROT || ce == CE_MUTAGEN) && !chaos())
+    if ((ce == CE_ROT || ce == CE_MUTAGEN) && !how_chaotic())
         uncleanliness++;
 
     // Zin has a food conduct for monsters too.
@@ -3600,7 +3600,7 @@ int monster::known_chaos(bool check_spells_god) const
  *        religion; silver damage does not.
  * @returns 0 if not chaotic, a larger number if so.
  */
-int monster::chaos(bool check_spells_god) const
+int monster::how_chaotic(bool check_spells_god) const
 {
     // Don't count known shapeshifters twice.
     if (is_shapeshifter() && (flags & MF_KNOWN_SHIFTER))
diff --git a/crawl-ref/source/monster.h b/crawl-ref/source/monster.h
index 429e8403bc..4c231505a6 100644
--- a/crawl-ref/source/monster.h
+++ b/crawl-ref/source/monster.h
@@ -331,9 +331,9 @@ public:
     bool is_unholy(bool check_spells = true) const;
     bool is_evil(bool check_spells = true) const;
     bool is_insane() const;
-    int unclean(bool check_god = true) const;
+    int how_unclean(bool check_god = true) const;
     int known_chaos(bool check_spells_god = false) const;
-    int chaos(bool check_spells_god = false) const;
+    int how_chaotic(bool check_spells_god = false) const;
     bool is_artificial() const;
     bool is_unbreathing() const;
     bool is_insubstantial() const;
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index a1019d8ccd..393fc5e65d 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -6655,7 +6655,7 @@ bool player::is_evil(bool check_spells) const
 // This is a stub. Check is used only for silver damage. Worship of chaotic
 // gods should probably be checked in the non-existing player::is_unclean,
 // which could be used for something Zin-related (such as a priestly monster).
-int player::chaos(bool /*check_spells_god*/) const
+int player::how_chaotic(bool /*check_spells_god*/) const
 {
     return 0;
 }
diff --git a/crawl-ref/source/player.h b/crawl-ref/source/player.h
index 13a6e7b54e..ddf1f7c4ce 100644
--- a/crawl-ref/source/player.h
+++ b/crawl-ref/source/player.h
@@ -613,7 +613,7 @@ public:
     bool is_holy(bool spells = true) const;
     bool is_unholy(bool spells = true) const;
     bool is_evil(bool spells = true) const;
-    int chaos(bool check_spells_god) const;
+    int how_chaotic(bool check_spells_god) const;
     bool is_artificial() const;
     bool is_unbreathing() const;
     bool is_insubstantial() const;