From 71ad92da616950e6a90a9bf5bc7aeb28dc13ebbb Mon Sep 17 00:00:00 2001
From: dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>
Date: Wed, 2 Jul 2008 02:07:37 +0000
Subject: Add more miscellaneous minor fixes.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6314 c06c8d41-db1a-0410-9941-cceddc491573
---
 crawl-ref/source/beam.cc    |  2 +-
 crawl-ref/source/effects.cc |  2 +-
 crawl-ref/source/fight.cc   | 16 ++++++++--------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index e52c26d624..9c2fab13a2 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -2039,7 +2039,7 @@ void fire_beam(bolt &pbolt, item_def *item, bool drop_item)
             xom_is_stimulated(128);
 
         // Allow friendlies to react to projectiles, except when in
-        // Sanctuary when pet_target can only be explictly changed
+        // sanctuary when pet_target can only be explictly changed
         // by the player.
         const monsters *mon = &menv[pbolt.beam_source];
         if (pbolt.foe_hurt > 0 && !mons_wont_attack(mon)
diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc
index b3dfc3fbeb..c8612dc3a3 100644
--- a/crawl-ref/source/effects.cc
+++ b/crawl-ref/source/effects.cc
@@ -2021,7 +2021,7 @@ void yell(bool force)
         if (env.sanctuary_time > 0)
         {
             if (!yesno("An ally attacking under your orders might violate "
-                       "sanctuary; order anyways?", false, 'n'))
+                       "sanctuary; order anyway?", false, 'n'))
             {
                 canned_msg(MSG_OK);
                 return;
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index e59d750fda..d2d9698d88 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -3125,8 +3125,8 @@ bool melee_attack::mons_attack_mons()
          || is_sanctuary(def_pos.x, def_pos.y))
         && atk != def)
     {
-        // Friendly monsters should only violate sanctuary if
-        // explictly ordered to do so by the player.
+        // Friendly monsters should only violate sanctuary if explicitly
+        // ordered to do so by the player.
         if (mons_friendly(atk))
         {
             if (you.pet_target == MHITYOU || you.pet_target == MHITNOT)
@@ -3159,9 +3159,9 @@ bool melee_attack::mons_attack_mons()
         behaviour_event(def, ME_WHACK, monster_index(atk));
     }
 
-    // If an enemy attacked a friend, set the pet target if it isn't
-    // set already, but not if Sanctuary is in effect (pet target must
-    // be set explicitly by the player during Sanctuary)
+    // If an enemy attacked a friend, set the pet target if it isn't set
+    // already, but not if sanctuary is in effect (pet target must be
+    // set explicitly by the player during sanctuary).
     if (perceived_attack && atk->alive() && mons_friendly(def)
         && !mons_wont_attack(atk) && you.pet_target == MHITNOT
         && env.sanctuary_time <= 0)
@@ -4005,9 +4005,9 @@ void melee_attack::mons_check_attack_perceived()
     {
         interrupt_activity(AI_MONSTER_ATTACKS, atk);
 
-        // If a friend wants to help, they can attack the attacking monster,
-        // unless Sanctuary is in effect since pet target can only be
-        // changed explicitly by the player during sanctuary.
+        // If a friend wants to help, they can attack the attacking
+        // monster, unless sanctuary is in effect since pet_target can
+        // only be changed explicitly by the player during sanctuary.
         if (you.pet_target == MHITNOT && env.sanctuary_time <= 0)
             you.pet_target = monster_index(atk);
     }
-- 
cgit v1.2.3-54-g00ecf