Add minor cosmetic fixes.

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

5 files changed, 14 insertions, 13 deletions

diff --git a/crawl-ref/source/it_use2.cc b/crawl-ref/source/it_use2.cc
index cdcafa1a69..bc47752444 100644
--- a/crawl-ref/source/it_use2.cc
+++ b/crawl-ref/source/it_use2.cc
@@ -54,7 +54,7 @@ bool potion_effect( potion_type pot_eff, int pow, bool was_known )
         pow = 150;
 
     const int factor
-        = (you.species == SP_VAMPIRE && you.hunger_state <= HS_HUNGRY? 2 : 1);
+        = (you.species == SP_VAMPIRE && you.hunger_state < HS_SATIATED ? 2 : 1);
 
     switch (pot_eff)
     {
@@ -100,7 +100,7 @@ bool potion_effect( potion_type pot_eff, int pow, bool was_known )
             lessen_hunger(1000, true);
 
             // healing depends on thirst
-            if (you.hunger_state <= HS_HUNGRY) // !heal wounds
+            if (you.hunger_state < HS_SATIATED) // !heal wounds
             {
                 inc_hp((10 + random2avg(30,2)) / factor, false);
                 mpr("You feel much better.");
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc
index cab1c2f877..0af3074f5e 100644
--- a/crawl-ref/source/misc.cc
+++ b/crawl-ref/source/misc.cc
@@ -1067,7 +1067,7 @@ bool victim_can_bleed(int montype)
     if (montype == -1) // player
     {
         if (you.is_undead && (you.species != SP_VAMPIRE
-                              || you.hunger_state < HS_FULL))
+                              || you.hunger_state <= HS_SATIATED))
         {
             return (false);
         }
diff --git a/crawl-ref/source/mutation.cc b/crawl-ref/source/mutation.cc
index 3fb3576c78..2ae11a51dc 100644
--- a/crawl-ref/source/mutation.cc
+++ b/crawl-ref/source/mutation.cc
@@ -1240,14 +1240,15 @@ formatted_string describe_mutations()
                 result += "</green>";
             }
         }
+
         if (you.hunger_state <= HS_STARVING)
             result += "<green>You do not heal.</green>" EOL;
         else if (you.hunger_state <= HS_HUNGRY)
             result += "<green>You heal slowly.</green>" EOL;
-        else if (you.hunger_state >= HS_ENGORGED)
-            result += "<green>Your natural rate of healing is extremely fast.</green>" EOL;
         else if (you.hunger_state >= HS_FULL)
             result += "<green>Your natural rate of healing is unusually fast.</green>" EOL;
+        else if (you.hunger_state == HS_ENGORGED)
+            result += "<green>Your natural rate of healing is extremely fast.</green>" EOL;
         have_any = true;
         break;
 
@@ -1687,14 +1688,14 @@ bool mutate(mutation_type which_mutation, bool failMsg, bool force_mutation,
     bool rotting = you.is_undead;
     if (you.species == SP_VAMPIRE)
     {
-        // The stat gain mutation always come through at Satiated or higher
-        // (mostly for convenience), and for consistency also their
-        // negative counterparts.
+        // The stat gain mutation always come through at Satiated or
+        // higher (mostly for convenience), and, for consistency, also
+        // their negative counterparts.
         if (which_mutation == MUT_STRONG || which_mutation == MUT_CLEVER
             || which_mutation == MUT_AGILE || which_mutation == MUT_WEAK
             || which_mutation == MUT_DOPEY || which_mutation == MUT_CLUMSY)
         {
-            if (you.hunger_state >= HS_FULL)
+            if (you.hunger_state > HS_SATIATED)
                 rotting = false;
         }
         else
diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc
index ac901039c8..ac2ddeb045 100644
--- a/crawl-ref/source/output.cc
+++ b/crawl-ref/source/output.cc
@@ -2062,10 +2062,10 @@ std::string _status_mut_abilities()
         {
             if (you.hunger_state <= HS_HUNGRY)
                 text += " slowly";
-            else if (you.hunger_state == HS_ENGORGED)
-                text += " very quickly";
             else if (you.hunger_state >= HS_FULL)
                 text += " quickly";
+            else if (you.hunger_state == HS_ENGORGED)
+                text += " very quickly";
         }
         text += ", ";
     }
@@ -2305,7 +2305,7 @@ std::string _status_mut_abilities()
           break;
 
       case SP_VAMPIRE:
-          if (you.experience_level < 13 || you.hunger_state > HS_HUNGRY)
+          if (you.experience_level < 13 || you.hunger_state >= HS_SATIATED)
               break;
           // else fall-through
       case SP_MUMMY:
diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc
index f31688ac27..0e272fe8ae 100644
--- a/crawl-ref/source/spl-cast.cc
+++ b/crawl-ref/source/spl-cast.cc
@@ -824,7 +824,7 @@ static bool _vampire_cannot_cast(spell_type spell)
     if (you.species != SP_VAMPIRE)
         return false;
 
-    if (you.hunger_state >= HS_FULL)
+    if (you.hunger_state > HS_SATIATED)
         return false;
 
     // Satiated or less