as the charm and neutral enchantments for polymorphed monsters, and do it for all of them, not just shapeshifters. If you polymorph them using the spell or the wand, it counts as an attack, so they'll lose the charm and neutral enchantments anyway, and their foe will be set to you. On the other hand, if e.g. Xom polymorphs them (since he doesn't check for temporary charm or neutrality), they'll remain as they were.

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