Misc. minor cleanups. (Yes, a huge amount of them but still...)

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

1 files changed, 6 insertions, 8 deletions

diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc
index 3a477828bc..5d60865592 100644
--- a/crawl-ref/source/spl-cast.cc
+++ b/crawl-ref/source/spl-cast.cc
@@ -113,11 +113,11 @@ static bool _surge_identify_boosters(spell_type spell)
                         }
                     }
 
-                return true;
+                return (true);
             }
         }
     }
-    return false;
+    return (false);
 }
 
 static void _surge_power(spell_type spell)
@@ -125,8 +125,6 @@ static void _surge_power(spell_type spell)
     int enhanced = 0;
 
     _surge_identify_boosters(spell);
-
-    //jmf: simplified
     enhanced += spell_enhancement(get_spell_disciplines(spell));
 
     if (enhanced)               // one way or the other {dlb}
@@ -853,10 +851,10 @@ static void _spellcasting_side_effects(spell_type spell, bool idonly = false)
 static bool _vampire_cannot_cast(spell_type spell)
 {
     if (you.species != SP_VAMPIRE)
-        return false;
+        return (false);
 
     if (you.hunger_state > HS_SATIATED)
-        return false;
+        return (false);
 
     // Satiated or less
     switch (spell)
@@ -872,9 +870,9 @@ static bool _vampire_cannot_cast(spell_type spell)
     case SPELL_SPIDER_FORM:
     case SPELL_STATUE_FORM:
     case SPELL_TAME_BEASTS:
-        return true;
+        return (true);
     default:
-        return false;
+        return (false);
     }
 }