summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/mon-stuff.cc
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2009-12-12 23:36:34 +0100
committerAdam Borowski <kilobyte@angband.pl>2009-12-13 00:06:16 +0100
commit92bf67d036734faa46331fd054131da1fdaa13b6 (patch)
tree3b2d9052e07b448d4304c0fb00886d0e6f2129be /crawl-ref/source/mon-stuff.cc
parenta6622f0a21421788f920c51a9d9c008510e95e3f (diff)
downloadcrawl-ref-92bf67d036734faa46331fd054131da1fdaa13b6.tar.gz
crawl-ref-92bf67d036734faa46331fd054131da1fdaa13b6.zip
Rename ENCH_NEUTRAL to ENCH_TEMP_PACIF since it's what it does.
Also, keep afflicted monsters from attacking the player. It's bad if they just got "impressed by your words" yet they hunt you and you can't even fight back.
Diffstat (limited to 'crawl-ref/source/mon-stuff.cc')
-rw-r--r--crawl-ref/source/mon-stuff.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/mon-stuff.cc b/crawl-ref/source/mon-stuff.cc
index afe17384ac..4f9fa50ac8 100644
--- a/crawl-ref/source/mon-stuff.cc
+++ b/crawl-ref/source/mon-stuff.cc
@@ -2483,7 +2483,7 @@ bool monster_polymorph(monsters *monster, monster_type targetc,
mon_enchant abj = monster->get_ench(ENCH_ABJ);
mon_enchant charm = monster->get_ench(ENCH_CHARM);
- mon_enchant neutral = monster->get_ench(ENCH_NEUTRAL);
+ mon_enchant temp_pacif= monster->get_ench(ENCH_TEMP_PACIF);
mon_enchant shifter = monster->get_ench(ENCH_GLOWING_SHAPESHIFTER,
ENCH_SHAPESHIFTER);
mon_enchant sub = monster->get_ench(ENCH_SUBMERGED);
@@ -2528,7 +2528,7 @@ bool monster_polymorph(monsters *monster, monster_type targetc,
monster->add_ench(abj);
monster->add_ench(charm);
- monster->add_ench(neutral);
+ monster->add_ench(temp_pacif);
monster->add_ench(shifter);
monster->add_ench(sub);
monster->add_ench(summon);