Add more size-related cleanups.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7490 c06c8d41-db1a-0410-9941-cceddc491573

4 files changed, 7 insertions, 12 deletions

diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
index 9e6054a103..6e1b25077c 100644
--- a/crawl-ref/source/describe.cc
+++ b/crawl-ref/source/describe.cc
@@ -3242,13 +3242,9 @@ std::string get_skill_description(int skill, bool need_title)
             unarmed_attacks.push_back("do a headbutt attack");
 
         if (player_mutation_level(MUT_HOOVES))
-        {
             unarmed_attacks.push_back("kick your enemies with your hooves");
-        }
         else if (player_mutation_level(MUT_TALONS))
-        {
             unarmed_attacks.push_back("claw at your enemies with your talons");
-        }
         else if (you.species != SP_NAGA
                  && (you.species != SP_MERFOLK || !player_is_swimming()))
         {
diff --git a/crawl-ref/source/externs.h b/crawl-ref/source/externs.h
index d879d2b59d..21bedd446f 100644
--- a/crawl-ref/source/externs.h
+++ b/crawl-ref/source/externs.h
@@ -248,7 +248,7 @@ public:
     virtual bool can_pass_through(int x, int y) const;
     virtual bool can_pass_through(const coord_def &c) const;
 
-    virtual size_type body_size(int psize = PSIZE_BODY,
+    virtual size_type body_size(int psize = PSIZE_TORSO,
                                 bool base = false) const = 0;
     virtual int       body_weight() const = 0;
     virtual int       total_weight() const = 0;
@@ -850,7 +850,7 @@ public:
     bool      floundering() const;
     bool      extra_balanced() const;
     bool      can_pass_through_feat(dungeon_feature_type grid) const;
-    size_type body_size(int psize = PSIZE_BODY, bool base = false) const;
+    size_type body_size(int psize = PSIZE_TORSO, bool base = false) const;
     int       body_weight() const;
     int       total_weight() const;
     int       damage_type(int attk = -1);
@@ -1188,7 +1188,7 @@ public:
     bool      floundering() const;
     bool      extra_balanced() const;
     bool      can_pass_through_feat(dungeon_feature_type grid) const;
-    size_type body_size(int psize = PSIZE_BODY, bool base = false) const;
+    size_type body_size(int psize = PSIZE_TORSO, bool base = false) const;
     int       body_weight() const;
     int       total_weight() const;
     int       damage_type(int attk = -1);
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index 4b472bb6a5..e9d7b6e154 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -1010,7 +1010,7 @@ bool can_wear_armour(const item_def &item, bool verbose, bool ignore_temporary)
     }
 
     // Tiny races
-    if (you.species == SP_SPRIGGAN)
+    if (player_size(PSIZE_TORSO) <= SIZE_LITTLE)
     {
         if ((sub_type >= ARM_LEATHER_ARMOUR
                 && sub_type <= ARM_PLATE_MAIL)
diff --git a/crawl-ref/source/mutation.cc b/crawl-ref/source/mutation.cc
index 077b16f44b..b50c788020 100644
--- a/crawl-ref/source/mutation.cc
+++ b/crawl-ref/source/mutation.cc
@@ -1876,7 +1876,7 @@ bool mutate(mutation_type which_mutation, bool failMsg,
         return (false);
     }
 
-    // blurred vision/see invis
+    // No blurred vision with see invisible.
     if (mutat == MUT_BLURRY_VISION && you.mutation[MUT_ACUTE_VISION] > 0)
         return (false);
 
@@ -2045,10 +2045,11 @@ bool mutate(mutation_type which_mutation, bool failMsg,
         mpr(gain_mutation[mutat][you.mutation[mutat]], MSGCH_MUTATION);
         break;
 
-    //jmf: like horns
     case MUT_HOOVES:
     case MUT_TALONS:
         mpr(gain_mutation[mutat][you.mutation[mutat]], MSGCH_MUTATION);
+
+        // Hooves and talons force boots off.
         if (you_tran_can_wear(EQ_BOOTS))
             remove_one_equip(EQ_BOOTS);
         break;
@@ -2066,7 +2067,6 @@ bool mutate(mutation_type which_mutation, bool failMsg,
         break;
 
     case MUT_HORNS:
-    {
         mpr(gain_mutation[mutat][you.mutation[mutat]], MSGCH_MUTATION);
 
         // Horns force hard helmets off.
@@ -2077,7 +2077,6 @@ bool mutate(mutation_type which_mutation, bool failMsg,
             remove_one_equip(EQ_HELMET);
         }
         break;
-    }
 
     case MUT_STRONG_STIFF:
         if (you.mutation[MUT_FLEXIBLE_WEAK] > 0)