Add more minor cosmetic fixes.

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

2 files changed, 8 insertions, 16 deletions

diff --git a/crawl-ref/source/monplace.cc b/crawl-ref/source/monplace.cc
index f68e4c5b85..bcb58d2134 100644
--- a/crawl-ref/source/monplace.cc
+++ b/crawl-ref/source/monplace.cc
@@ -1393,8 +1393,8 @@ static void _define_zombie(int mid, monster_type ztype, monster_type cs,
     // Now override type with the required type.
     if (cs == MONS_ZOMBIE_SMALL || cs == MONS_ZOMBIE_LARGE)
     {
-        menv[mid].type = ((mons_zombie_size(menv[mid].base_monster) == Z_BIG)
-                             ? MONS_ZOMBIE_LARGE : MONS_ZOMBIE_SMALL);
+        menv[mid].type = ((mons_zombie_size(menv[mid].base_monster) == Z_BIG) ?
+                             MONS_ZOMBIE_LARGE : MONS_ZOMBIE_SMALL);
     }
     else if (cs == MONS_SKELETON_SMALL || cs == MONS_SKELETON_LARGE)
     {
@@ -1407,8 +1407,8 @@ static void _define_zombie(int mid, monster_type ztype, monster_type cs,
         menv[mid].ev -= 2;
         menv[mid].ev  = std::max(0, menv[mid].ev);
 
-        menv[mid].type = ((mons_zombie_size(menv[mid].base_monster) == Z_BIG)
-                             ? MONS_SKELETON_LARGE : MONS_SKELETON_SMALL);
+        menv[mid].type = ((mons_zombie_size(menv[mid].base_monster) == Z_BIG) ?
+                             MONS_SKELETON_LARGE : MONS_SKELETON_SMALL);
     }
     else if (cs == MONS_SIMULACRUM_SMALL || cs == MONS_SIMULACRUM_LARGE)
     {
@@ -1416,8 +1416,8 @@ static void _define_zombie(int mid, monster_type ztype, monster_type cs,
         menv[mid].hit_points     = hit_points(menv[mid].hit_dice, 1, 4);
         menv[mid].max_hit_points = menv[mid].hit_points;
 
-        menv[mid].type = ((mons_zombie_size(menv[mid].base_monster) == Z_BIG)
-                             ? MONS_SIMULACRUM_LARGE : MONS_SIMULACRUM_SMALL);
+        menv[mid].type = ((mons_zombie_size(menv[mid].base_monster) == Z_BIG) ?
+                             MONS_SIMULACRUM_LARGE : MONS_SIMULACRUM_SMALL);
     }
     else if (cs == MONS_SPECTRAL_THING)
     {
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index 4502e19793..a929e07851 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -1300,9 +1300,7 @@ static bool _blessing_wpn(monsters* mon)
     int slot;
 
     do
-    {
         slot = (coinflip()) ? weapon : alt_weapon;
-    }
     while (slot == NON_ITEM);
 
     item_def& wpn(mitm[slot]);
@@ -1330,9 +1328,7 @@ static bool _blessing_AC(monsters* mon)
     int slot;
 
     do
-    {
         slot = (coinflip()) ? armour : shield;
-    }
     while (slot == NON_ITEM);
 
     item_def& arm(mitm[slot]);
@@ -1372,7 +1368,7 @@ static bool _blessing_balms(monsters *mon)
     if (mon->del_ench(ENCH_FATIGUE, true))
         success = true;
 
-    return success;
+    return (success);
 }
 
 static bool _blessing_healing(monsters* mon)
@@ -1403,9 +1399,7 @@ static bool _tso_blessing_holy_wpn(monsters* mon)
     int slot;
 
     do
-    {
         slot = (coinflip()) ? weapon : alt_weapon;
-    }
     while (slot == NON_ITEM);
 
     item_def& wpn(mitm[slot]);
@@ -1449,9 +1443,7 @@ static bool _tso_blessing_holy_arm(monsters* mon)
     int slot;
 
     do
-    {
         slot = (coinflip()) ? armour : shield;
-    }
     while (slot == NON_ITEM);
 
     item_def& arm(mitm[slot]);
@@ -1490,7 +1482,7 @@ static bool _increase_ench_duration(monsters *mon,
 static int _tso_blessing_extend_stay(monsters* mon)
 {
     if (!mon->has_ench(ENCH_ABJ))
-        return 0;
+        return (0);
 
     mon_enchant abj = mon->get_ench(ENCH_ABJ);