Add more consistency fixes for polymorphing shapeshifters.

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

1 files changed, 11 insertions, 6 deletions

diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc
index 5f4f98a99a..ac0edba508 100644
--- a/crawl-ref/source/monstuff.cc
+++ b/crawl-ref/source/monstuff.cc
@@ -1584,20 +1584,25 @@ bool monster_polymorph( monsters *monster, monster_type targetc,
     monster->type   = targetc;
     monster->number = MONS_PROGRAM_BUG;
 
-    mon_enchant abj     = monster->get_ench(ENCH_ABJ);
-    mon_enchant shifter = monster->get_ench(ENCH_GLOWING_SHAPESHIFTER,
-                                            ENCH_SHAPESHIFTER);
-    mon_enchant charm   = monster->get_ench(ENCH_CHARM);
-    mon_enchant neutral = monster->get_ench(ENCH_NEUTRAL);
+    mon_attitude_type attitude = monster->attitude;
+    unsigned int foe           = monster->foe;
+    mon_enchant abj            = monster->get_ench(ENCH_ABJ);
+    mon_enchant shifter        = monster->get_ench(ENCH_GLOWING_SHAPESHIFTER,
+                                                   ENCH_SHAPESHIFTER);
+    mon_enchant charm          = monster->get_ench(ENCH_CHARM);
+    mon_enchant neutral        = monster->get_ench(ENCH_NEUTRAL);
 
     // Note: define_monster() will clear out all enchantments! -- bwr
     define_monster( monster_index(monster) );
 
     monster->add_ench(abj);
     monster->add_ench(shifter);
-    // Only shapeshifters retain the charm and neutral enchantments.
+    // Only shapeshifters retain attitude, foe, and the charm and
+    // neutral enchantments.
     if (old_mon_shifter)
     {
+        monster->attitude = attitude;
+        monster->foe = foe;
         monster->add_ench(charm);
         monster->add_ench(neutral);
     }