Add mesilliac's patch in [1944555] for improved handling of

followers/summoned creatures, with one minor tweak to take good neutral 
monsters into account.


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

1 files changed, 9 insertions, 2 deletions

diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc
index b8cd4e72b5..1503094343 100644
--- a/crawl-ref/source/effects.cc
+++ b/crawl-ref/source/effects.cc
@@ -1913,6 +1913,8 @@ void yell(bool force)
                 targ_prev = true;
             }
         }
+
+        mpr(" h - Order allies to stop attacking");
    }
 
     mprf(" Anything else - Stay silent%s",
@@ -1967,7 +1969,12 @@ void yell(bool force)
             mons_targd = you.prev_targ;
             break;
         }
-        /* fall through... */
+
+    case 'h':
+        mons_targd = MHITYOU;
+        break;
+
+    /* fall through... */
     default:
         mpr("Okely-dokely.");
         return;
@@ -1980,7 +1987,7 @@ void yell(bool force)
     }
 
     noisy( 10, you.x_pos, you.y_pos );
-    mpr("Attack!");
+    mpr(mons_targd == MHITYOU ? "Heel!" : "Attack!");
 }                               // end yell()
 
 bool forget_inventory(bool quiet)