summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/monstuff.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-03-30 03:57:43 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-03-30 03:57:43 +0000
commitff82d5caa356efe08345101721f55658bc4c377c (patch)
treeb4189e1c8644f5c77108b3727265e8ec9d099edc /crawl-ref/source/monstuff.cc
parent3c3f238465f6301380edba2ca1b4a71fbf52cff5 (diff)
downloadcrawl-ref-ff82d5caa356efe08345101721f55658bc4c377c.tar.gz
crawl-ref-ff82d5caa356efe08345101721f55658bc4c377c.zip
Fix [1929110]: Preserve a monster's charmed status when polymorphing.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3944 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/monstuff.cc')
-rw-r--r--crawl-ref/source/monstuff.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc
index 4bbd9e2170..6a2e1e54ec 100644
--- a/crawl-ref/source/monstuff.cc
+++ b/crawl-ref/source/monstuff.cc
@@ -1501,6 +1501,7 @@ bool monster_polymorph( monsters *monster, monster_type targetc,
monster->number = MONS_PROGRAM_BUG;
mon_enchant abj = monster->get_ench(ENCH_ABJ);
+ mon_enchant charm = monster->get_ench(ENCH_CHARM);
mon_enchant shifter = monster->get_ench(ENCH_GLOWING_SHAPESHIFTER,
ENCH_SHAPESHIFTER);
@@ -1508,6 +1509,7 @@ bool monster_polymorph( monsters *monster, monster_type targetc,
define_monster( monster_index(monster) );
monster->add_ench(abj);
+ monster->add_ench(charm);
monster->add_ench(shifter);
monster->ench_countdown = old_ench_countdown;