Add yet more minor cosmetic fixes.

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

3 files changed, 17 insertions, 18 deletions

diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc
index 428a0c2b64..6e2a43bf1b 100644
--- a/crawl-ref/source/abl-show.cc
+++ b/crawl-ref/source/abl-show.cc
@@ -1804,12 +1804,12 @@ static bool _do_ability(const ability_def& abil)
         break;
 
     case ABIL_BEOGH_SMITING:
-        if (your_spells( SPELL_SMITING, (2 + skill_bump(SK_INVOCATIONS)) * 6,
-                         false ) == SPRET_ABORT)
+        if (your_spells(SPELL_SMITING, (2 + skill_bump(SK_INVOCATIONS)) * 6,
+                        false) == SPRET_ABORT)
         {
             return (false);
         }
-        exercise( SK_INVOCATIONS, (coinflip()? 3 : 2) );
+        exercise(SK_INVOCATIONS, (coinflip() ? 3 : 2));
         break;
 
     case ABIL_BEOGH_RECALL_ORCISH_FOLLOWERS:
@@ -1990,7 +1990,7 @@ static void _add_talent(std::vector<talent>& vec, const ability_type ability,
         vec.push_back(t);
 }
 
-std::vector<talent> your_talents( bool check_confused )
+std::vector<talent> your_talents(bool check_confused)
 {
     std::vector<talent> talents;
 
@@ -2243,10 +2243,10 @@ std::vector<talent> your_talents( bool check_confused )
 // the old invocation slots void and erase them).  We also try to
 // protect any bindings the character might have made into the
 // traditional invocation slots (A-E and X). -- bwr
-static void _set_god_ability_helper( ability_type abil, char letter )
+static void _set_god_ability_helper(ability_type abil, char letter)
 {
     int i;
-    const int index = letter_to_index( letter );
+    const int index = letter_to_index(letter);
 
     for (i = 0; i < 52; i++)
         if (you.ability_letter_table[i] == abil)
@@ -2265,7 +2265,7 @@ static void _set_god_ability_helper( ability_type abil, char letter )
 static int _is_god_ability(int abil)
 {
     if (abil == ABIL_NON_ABILITY)
-        return GOD_NO_GOD;
+        return (GOD_NO_GOD);
 
     for (int i = 0; i < MAX_NUM_GODS; ++i)
         for (int j = 0; j < MAX_GOD_ABILITIES; ++j)
@@ -2305,21 +2305,21 @@ void set_god_ability_slots()
 
 // Returns an index (0-51) if successful, -1 if you should
 // just use the next one.
-static int _find_ability_slot( ability_type which_ability )
+static int _find_ability_slot(ability_type which_ability)
 {
     for (int slot = 0; slot < 52; slot++)
         if (you.ability_letter_table[slot] == which_ability)
-            return slot;
+            return (slot);
 
     // No requested slot, find new one and make it preferred.
 
-    // Skip over a-e (invocations)
+    // Skip over a-e (invocations).
     for (int slot = 5; slot < 52; slot++)
     {
         if (you.ability_letter_table[slot] == ABIL_NON_ABILITY)
         {
             you.ability_letter_table[slot] = which_ability;
-            return slot;
+            return (slot);
         }
     }
 
@@ -2329,12 +2329,12 @@ static int _find_ability_slot( ability_type which_ability )
         if (you.ability_letter_table[slot] == ABIL_NON_ABILITY)
         {
             you.ability_letter_table[slot] = which_ability;
-            return slot;
+            return (slot);
         }
     }
 
     // All letters are assigned.
-    return -1;
+    return (-1);
 }
 
 ////////////////////////////////////////////////////////////////////////////
diff --git a/crawl-ref/source/abl-show.h b/crawl-ref/source/abl-show.h
index 65d3ec1d66..c23c8800cb 100644
--- a/crawl-ref/source/abl-show.h
+++ b/crawl-ref/source/abl-show.h
@@ -73,11 +73,11 @@ int choose_ability_menu(const std::vector<talent>& talents);
  * called from: acr
  * *********************************************************************** */
 bool activate_ability();
-std::vector<talent> your_talents( bool check_confused );
+std::vector<talent> your_talents(bool check_confused);
 
-std::string print_abilities( void );
+std::string print_abilities(void);
 
-void set_god_ability_slots( void );
+void set_god_ability_slots(void);
 
 
 #endif
diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc
index 402330d32e..cc6eb1d7ec 100644
--- a/crawl-ref/source/newgame.cc
+++ b/crawl-ref/source/newgame.cc
@@ -5650,9 +5650,7 @@ bool _give_items_skills()
         if (!you.weapon())
             you.skills[SK_UNARMED_COMBAT] = weap_skill;
         else
-        {
             you.skills[weapon_skill(*you.weapon())] = weap_skill;
-        }
     }
 
     init_skill_order();
@@ -5662,5 +5660,6 @@ bool _give_items_skills()
         you.worshipped[you.religion] = 1;
         set_god_ability_slots();
     }
+
     return (true);
 }