Consistently anger monsters turned into shapeshifters again, so that

they immediately turn on you if you worship Zin, or turn on you when in 
the form of an evil monster if you worship another good god.


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

1 files changed, 1 insertions, 5 deletions

diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc
index eac3d1a241..7d1eaad37e 100644
--- a/crawl-ref/source/xom.cc
+++ b/crawl-ref/source/xom.cc
@@ -937,19 +937,15 @@ static bool _xom_polymorph_nearby_monster(bool helpful)
                                           : "bad monster polymorph");
             god_speaks(GOD_XOM, _get_xom_speech(lookup).c_str());
 
-            bool made_shifter = false;
-
             if (one_chance_in(8) && !mons_is_shapeshifter(mon))
             {
                 mon->add_ench(one_chance_in(3) ? ENCH_GLOWING_SHAPESHIFTER
                                                : ENCH_SHAPESHIFTER);
-                made_shifter = true;
             }
 
             const bool powerup = !(mons_wont_attack(mon) ^ helpful);
             monster_polymorph(mon, RANDOM_MONSTER,
-                              powerup ? PPT_MORE : PPT_LESS,
-                              made_shifter);
+                              powerup ? PPT_MORE : PPT_LESS);
 
             rc = true;
         }