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, 10 insertions, 0 deletions

diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index ff453ddf27..82543ee2ad 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -3038,11 +3038,21 @@ int melee_attack::player_calc_base_weapon_damage()
 bool melee_attack::mons_attack_mons()
 {
     mons_perform_attack();
+
     if (perceived_attack && (def->foe == MHITNOT || one_chance_in(3))
         && atk->alive() && def->alive())
     {
         behaviour_event(def, ME_WHACK, monster_index(atk));
     }
+
+    // if an enemy attacked a friend, set the pet target if it isn't
+    // set already
+    if (perceived_attack && atk->alive() && mons_friendly(def)
+        && !mons_wont_attack(atk) && you.pet_target == MHITNOT)
+    {
+        you.pet_target = monster_index(atk);
+    }
+
     return (did_hit);
 }