Fix aborting unchivalric attacks costing a turn.

Implement ordering your friends to stay where they are.
To do this, I've added a new variable to the monster struct:
patrol_point, that is set by the new t sub-command "Wait here!"
Once this is set, monsters will spend their time wandering around within
the LOS radius centred on the patrol point. If they are attacked, or
the player or other friends are attacked, they'll stop wandering to
fight, but once the foe is gone, they continue doing so.
Currently, the only way to make them stop again is to issue another
command, "Follow me!" that is basically the already existing "Come
here!" command. I've also added a "Stop fighting!" command that for 
non-patrolling monsters has the same effect as "Follow me!" - 
patrolling monsters are supposed to take up their wanderings again.


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

1 files changed, 5 insertions, 5 deletions

diff --git a/crawl-ref/source/it_use3.cc b/crawl-ref/source/it_use3.cc
index f478c5ee9d..4c8478290c 100644
--- a/crawl-ref/source/it_use3.cc
+++ b/crawl-ref/source/it_use3.cc
@@ -296,16 +296,16 @@ static bool reaching_weapon_attack(const item_def& wpn)
      *       slips between the squares.
      */
 
-    // if we're attacking more than a space away
-    if ((x_distance > 1) || (y_distance > 1))
+    // If we're attacking more than a space away...
+    if (x_distance > 1 || y_distance > 1)
     {
         const int x_middle = MAX(beam.tx, you.x_pos) - (x_distance / 2);
         const int y_middle = MAX(beam.ty, you.y_pos) - (y_distance / 2);
 
-        // if either the x or the y is the same, we should check for
+        // If either the x or the y is the same, we should check for
         // a monster:
-        if (((beam.tx == you.x_pos) || (beam.ty == you.y_pos))
-            && (mgrd[x_middle][y_middle] != NON_MONSTER))
+        if ((beam.tx == you.x_pos || beam.ty == you.y_pos)
+            && mgrd[x_middle][y_middle] != NON_MONSTER)
         {
             const int skill = weapon_skill( wpn.base_type, wpn.sub_type );