Add still more minor cosmetic fixes.

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

6 files changed, 12 insertions, 8 deletions

diff --git a/crawl-ref/source/command.cc b/crawl-ref/source/command.cc
index b0a7df2bba..df0d87914d 100644
--- a/crawl-ref/source/command.cc
+++ b/crawl-ref/source/command.cc
@@ -1341,8 +1341,8 @@ static bool _do_description(std::string key, std::string type,
     {
         monster_type mon_num = get_monster_by_name(key, true);
         // Don't attempt to get more information on ghosts or
-        // pandemonium demons as the ghost struct has not been initialized
-        // which will cause a crash.
+        // pandemonium demons, as the ghost struct has not been
+        // initialised, which will cause a crash.
         if (mon_num != MONS_PROGRAM_BUG && mon_num != MONS_PLAYER_GHOST
             && mon_num != MONS_PANDEMONIUM_DEMON)
         {
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
index ac21088392..9fc5de9beb 100644
--- a/crawl-ref/source/describe.cc
+++ b/crawl-ref/source/describe.cc
@@ -2837,6 +2837,7 @@ void get_monster_db_desc(const monsters& mons, describe_info &inf,
         inf.body << "$" << _describe_draconian( &mons );
         break;
     }
+
     case MONS_PLAYER_GHOST:
         inf.body << "The apparition of " << get_ghost_description(mons) << ".$";
         break;
@@ -2856,6 +2857,7 @@ void get_monster_db_desc(const monsters& mons, describe_info &inf,
                 "monsters who masquerade as program bugs or run around the "
                 "dungeon without a proper description to the authorities.$";
         break;
+
     default:
         break;
     }
diff --git a/crawl-ref/source/ghost.cc b/crawl-ref/source/ghost.cc
index 970306a5b6..a92e1fa1c2 100644
--- a/crawl-ref/source/ghost.cc
+++ b/crawl-ref/source/ghost.cc
@@ -520,9 +520,10 @@ std::vector<ghost_demon> ghost_demon::find_ghosts()
         gs.push_back(player);
     }
 
-    // Pick up any other ghosts that happen to be on the level if we have space.
-    // If the player is undead, add one to the ghost quota for the level.
-    find_extra_ghosts( gs, n_extra_ghosts() + 1 - gs.size() );
+    // Pick up any other ghosts that happen to be on the level if we
+    // have space.  If the player is undead, add one to the ghost quota
+    // for the level.
+    find_extra_ghosts(gs, n_extra_ghosts() + 1 - gs.size());
 
     return (gs);
 }
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc
index 91eed7b027..78c29398c3 100644
--- a/crawl-ref/source/mon-util.cc
+++ b/crawl-ref/source/mon-util.cc
@@ -6265,7 +6265,7 @@ void monsters::pandemon_init()
     ev              = ghost->ev;
     flags           = MF_INTERESTING;
     // Don't make greased-lightning Pandemonium demons in the dungeon
-    // max speed = 17). Demons in Pandemonium can be up to speed 24.
+    // max speed = 17).  Demons in Pandemonium can be up to speed 24.
     if (you.level_type == LEVEL_DUNGEON)
         speed = (one_chance_in(3) ? 10 : 7 + roll_dice(2, 5));
     else
diff --git a/crawl-ref/source/mon-util.h b/crawl-ref/source/mon-util.h
index fd10edd123..6a69b2c90d 100644
--- a/crawl-ref/source/mon-util.h
+++ b/crawl-ref/source/mon-util.h
@@ -520,7 +520,7 @@ bool mons_player_visible(const monsters *mon);
 int get_shout_noise_level(const shout_type shout);
 shout_type mons_shouts(int mclass, bool demon_shout = false);
 
-bool mons_is_unique(int mclass);
+bool mons_is_unique(int mc);
 
 // last updated 12may2000 {dlb}
 /* ***********************************************************************
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc
index c5bd78a850..a7f15367a1 100644
--- a/crawl-ref/source/monstuff.cc
+++ b/crawl-ref/source/monstuff.cc
@@ -5643,7 +5643,8 @@ static void _handle_nearby_ability(monsters *monster)
             monster->colour = random_colour();
         break;
 
-    default: break;
+    default:
+        break;
     }
 }