Add minor cosmetic fixes.

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

7 files changed, 17 insertions, 17 deletions

diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index 2dd06f43e4..507c6441d0 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -5416,7 +5416,7 @@ bool bolt::nice_to(const monsters *mon) const
 
 // A constructor for bolt to help guarantee that we start clean (this has
 // caused way too many bugs).  Putting it here since there's no good place to
-// put it, and it doesn't do anything other than initialize it's members.
+// put it, and it doesn't do anything other than initialize its members.
 //
 // TODO: Eventually it'd be nice to have a proper factory for these things
 // (extended from setup_mons_cast() and zapping() which act as limited ones).
diff --git a/crawl-ref/source/debug.cc b/crawl-ref/source/debug.cc
index 00f7b481f5..151f42b73a 100644
--- a/crawl-ref/source/debug.cc
+++ b/crawl-ref/source/debug.cc
@@ -2461,7 +2461,7 @@ void debug_mons_scan()
                 _announce_level_prob(warned);
                 warned = true;
                 mprf(MSGCH_WARN, "Monster %s (%d, %d) holding item %s, but "
-                                 "item think's it's held by monster %s "
+                                 "item thinks it's held by monster %s "
                                  "(%d, %d)",
                      m->full_name(DESC_PLAIN, true).c_str(),
                      m->pos().x, m->pos().y,
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index 04e985a1b1..511ac39987 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -1889,7 +1889,7 @@ bool melee_attack::player_monattk_hit_effects(bool mondied)
     if (needs_message && !special_damage_message.empty())
     {
         mprf("%s", special_damage_message.c_str());
-        // Don't do a message-only miscast right after a special damage
+        // Don't do a message-only miscast right after a special damage.
         if (miscast_level == 0)
             miscast_level = -1;
     }
@@ -2163,8 +2163,8 @@ bool melee_attack::distortion_affects_defender()
         else if (defender_visible)
             obvious_effect = true;
 
-        defender->banish( atk ? atk->name(DESC_PLAIN, true)
-                              : attacker->name(DESC_PLAIN) );
+        defender->banish(atk ? atk->name(DESC_PLAIN, true)
+                             : attacker->name(DESC_PLAIN));
         return (true);
     }
 
@@ -2481,7 +2481,7 @@ static void _find_remains(monsters* mon, int &corpse_class, int &corpse_index,
                           item_def &fake_corpse, int &last_item,
                           std::vector<int> items)
 {
-    for (int i = 0; i < NUM_MONSTER_SLOTS; i++)
+    for (int i = 0; i < NUM_MONSTER_SLOTS; ++i)
     {
         const int idx = mon->inv[i];
 
@@ -2528,7 +2528,7 @@ static void _find_remains(monsters* mon, int &corpse_class, int &corpse_index,
         }
         else
         {
-            // Last item which we're sure belonded to the monster.
+            // Last item which we're sure belonged to the monster.
             for (unsigned int i = 0; i < items.size(); i++)
             {
                 if (items[i] == si.link())
@@ -4641,23 +4641,22 @@ void melee_attack::mons_perform_attack_rounds()
             special_damage = 0;
             special_damage_message.clear();
 
-            // Monsters attacking themselves don't get attack flavour, the
-            // message sequences look too weird.
+            // Monsters attacking themselves don't get attack flavour.
+            // The message sequences look too weird.
             if (attacker != defender)
                 mons_apply_attack_flavour(attk);
 
             if (!special_damage_message.empty())
                 mprf("%s", special_damage_message.c_str());
 
-            // Defender banished, bail before chaos_killed_defender() is
-            // called since the defender is still alive in the Abyss.
+            // Defender banished.  Bail before chaos_killed_defender()
+            // is called, since the defender is still alive in the Abyss.
             if (!defender->alive())
             {
                 if (chaos_attack && attacker->alive())
                     chaos_affects_attacker();
 
                 do_miscast();
-
                 break;
             }
 
@@ -4736,7 +4735,7 @@ void melee_attack::mons_perform_attack_rounds()
         if (weap && you.can_see(atk) && weap->cursed()
             && is_range_weapon(*weap))
         {
-            set_ident_flags( *weap, ISFLAG_KNOW_CURSE );
+            set_ident_flags(*weap, ISFLAG_KNOW_CURSE);
         }
     }
 
diff --git a/crawl-ref/source/monplace.cc b/crawl-ref/source/monplace.cc
index 0a0574b523..01556be79b 100644
--- a/crawl-ref/source/monplace.cc
+++ b/crawl-ref/source/monplace.cc
@@ -584,7 +584,7 @@ static monster_type _resolve_monster_type(monster_type mon_type,
                     place = level_id::from_packed_place(base);
                     // If lev_mons is set to you.your_level, it was probably
                     // set as a default meaning "the current dungeon depth",
-                    // which for a portal vault using it's own definition
+                    // which for a portal vault using its own definition
                     // of random monsters means "the depth of whatever place
                     // we're using for picking the random monster".
                     if (*lev_mons == you.your_level)
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index 8bc7acfebb..2f44984916 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -2492,7 +2492,7 @@ int old_player_evasion(void)
         if (ev_change > armour_ev_penalty / 3)
             ev_change = armour_ev_penalty / 3;
 
-        ev += ev_change;        /* remember that it's negative */
+        ev += ev_change;        // remember that it's negative
     }
 
     ev += player_equip( EQ_RINGS_PLUS, RING_EVASION );
diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc
index 917e9a7b40..e62c1a69f5 100644
--- a/crawl-ref/source/spl-cast.cc
+++ b/crawl-ref/source/spl-cast.cc
@@ -808,7 +808,8 @@ static void _spellcasting_side_effects(spell_type spell, bool idonly = false)
     if (spell_typematch(spell, SPTYP_HOLY))
         did_god_conduct(DID_HOLY, 10 + spell_difficulty(spell));
 
-    // Self-banishment gets a special exemption - you're there to spread light
+    // Self-banishment gets a special exemption - you're there to spread
+    // light.
     if (_spell_is_unholy(spell) && !you.banished)
         did_god_conduct(DID_UNHOLY, 10 + spell_difficulty(spell));
 
diff --git a/crawl-ref/source/transfor.cc b/crawl-ref/source/transfor.cc
index ce58c7a81d..678b7b49ed 100644
--- a/crawl-ref/source/transfor.cc
+++ b/crawl-ref/source/transfor.cc
@@ -413,7 +413,7 @@ bool transform(int pow, transformation_type which_trans, bool quiet)
     if (you.species == SP_MERFOLK && player_is_swimming()
         && which_trans != TRAN_DRAGON)
     {
-        // This might by overkill, but it's okay because obviously
+        // This might be overkill, but it's okay because obviously
         // whatever magical ability that lets them walk on land is
         // removed when they're in water (in this case, their natural
         // form is completely over-riding any other... goes well with