&& monster->attitude != ATT_HOSTILE

             && (monster->attitude != ATT_HOSTILE
                 || monster->has_ench(ENCH_CHARM))

        monster->del_ench(ENCH_CHARM, true);