Don't display the warning prompt for firing a charming beam (from e.g. a

wand of enslavement) at a non-holy monster, since it doesn't generate 
negative conducts then.


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

1 files changed, 5 insertions, 5 deletions

diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index a0f9f129f5..0696d4510a 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -4300,11 +4300,7 @@ static int _affect_monster(bolt &beam, monsters *mon, item_def *item)
                     remove_sanctuary(true);
                 }
 
-                if (beam.flavour != BEAM_CHARM)
-                    set_attack_conducts(mon, conduct);
-                // No charming holy beings!
-                else if (mons_is_holy(mon))
-                    conduct.set(DID_ATTACK_HOLY, mon->hit_dice, true, mon);
+                set_attack_conducts(mon, conduct);
 
                 if (you.religion == GOD_BEOGH
                     && mons_species(mon->type) == MONS_ORC
@@ -5456,6 +5452,10 @@ static bool _nasty_beam(monsters *mon, bolt &beam)
 
     // now for some non-hurtful enchantments
 
+    // No charming holy beings!
+    if (beam.flavour == BEAM_CHARM)
+        return (mons_is_holy(mon));
+
     // degeneration / sleep
     if (beam.flavour == BEAM_DEGENERATE || beam.flavour == BEAM_SLEEP)
         return (mons_holiness(mon) == MH_NATURAL);