From 512f8e9eb3fa068d5601f7e5ed60d2d726d8f0ea Mon Sep 17 00:00:00 2001
From: dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>
Date: Mon, 23 Feb 2009 17:52:55 +0000
Subject: Add more minor cosmetic fixes.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9177 c06c8d41-db1a-0410-9941-cceddc491573
---
 crawl-ref/source/itemname.cc | 4 ++--
 crawl-ref/source/mutation.cc | 2 +-
 crawl-ref/source/output.cc   | 2 +-
 crawl-ref/source/player.cc   | 8 ++++----
 crawl-ref/source/skills2.cc  | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'crawl-ref')

diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc
index 7b32d44b99..cb6425a922 100644
--- a/crawl-ref/source/itemname.cc
+++ b/crawl-ref/source/itemname.cc
@@ -2579,7 +2579,7 @@ bool is_useless_item(const item_def &item, bool temp)
                        && you.hunger_state == HS_STARVING);
 
         case RING_REGENERATION:
-            return ((you.mutation[MUT_SLOW_HEALING] == 3)
+            return ((player_mutation_level(MUT_SLOW_HEALING) == 3)
                     || temp && you.species == SP_VAMPIRE
                        && you.hunger_state == HS_STARVING);
 
@@ -2626,7 +2626,7 @@ bool is_useless_item(const item_def &item, bool temp)
         if (you.has_spell(SPELL_BONE_SHARDS)
             || you.has_spell(SPELL_ANIMATE_DEAD)
             || you.has_spell(SPELL_ANIMATE_SKELETON)
-            || you.mutation[MUT_RAISE_DEAD]
+            || player_mutation_level(MUT_RAISE_DEAD)
             || you.religion == GOD_YREDELEMNUL
                && you.piety >= piety_breakpoint(0))
         {
diff --git a/crawl-ref/source/mutation.cc b/crawl-ref/source/mutation.cc
index 4f25a80bbb..894b2e5022 100644
--- a/crawl-ref/source/mutation.cc
+++ b/crawl-ref/source/mutation.cc
@@ -1936,7 +1936,7 @@ bool mutate(mutation_type which_mutation, bool failMsg,
     }
 
     // Saprovorous/gourmand can't be randomly acquired.
-    if (!force_mutation && (mutat == MUT_SAPROVOROUS || mutat == MUT_GOURMAND))
+    if ((mutat == MUT_SAPROVOROUS || mutat == MUT_GOURMAND) && !force_mutation)
         return (false);
 
     // Mutation resistance can't be acquired from god gifts.
diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc
index 6d7e7afce3..5e64e8e7e4 100644
--- a/crawl-ref/source/output.cc
+++ b/crawl-ref/source/output.cc
@@ -2256,7 +2256,7 @@ std::string _status_mut_abilities()
 
     if (you.disease && !you.duration[DUR_REGENERATION]
         || you.species == SP_VAMPIRE && you.hunger_state == HS_STARVING
-        || you.mutation[MUT_SLOW_HEALING] == 3)
+        || player_mutation_level(MUT_SLOW_HEALING) == 3)
     {
         status.push_back("non-regenerating");
     }
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index 7855a5ae1b..5e37c0b06f 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -1044,7 +1044,7 @@ int player_regen()
         rr += 100;
 
     // troll leather (except for trolls)
-    if (player_equip( EQ_BODY_ARMOUR, ARM_TROLL_LEATHER_ARMOUR )
+    if (player_equip(EQ_BODY_ARMOUR, ARM_TROLL_LEATHER_ARMOUR)
         && you.species != SP_TROLL)
     {
         rr += 30;
@@ -1106,9 +1106,9 @@ int player_regen()
 
     // Slow heal mutation. Applied last.
     // Each level reduces your natural heaing by one third.
-    if (you.mutation[MUT_SLOW_HEALING])
+    if (player_mutation_level(MUT_SLOW_HEALING))
     {
-        rr *= 3 - you.mutation[MUT_SLOW_HEALING];
+        rr *= 3 - player_mutation_level(MUT_SLOW_HEALING);
         rr /= 3;
     }
 
@@ -4093,7 +4093,7 @@ void display_char_status()
     {
         bool no_heal =
             (you.species == SP_VAMPIRE && you.hunger_state == HS_STARVING)
-            || (you.mutation[MUT_SLOW_HEALING] == 3);
+            || (player_mutation_level(MUT_SLOW_HEALING) == 3);
 
         if (!no_heal)
             _output_expiring_message(DUR_REGENERATION, "regenerating");
diff --git a/crawl-ref/source/skills2.cc b/crawl-ref/source/skills2.cc
index 19e924b15d..05eead734e 100644
--- a/crawl-ref/source/skills2.cc
+++ b/crawl-ref/source/skills2.cc
@@ -1622,7 +1622,7 @@ const int spec_skills[ NUM_SPECIES ][40] =
     {
     },
 
-    // SP_OGRE_MAGE placeholder
+    // SP_OGRE_MAGE placeholder.
     {
     },
 
-- 
cgit v1.2.3-54-g00ecf