Allow enchantments to affect wall monsters.

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

1 files changed, 6 insertions, 3 deletions

diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index 810ff042a9..9dc223b63e 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -1332,17 +1332,20 @@ static void _zappy(zap_type z_type, int power, bolt &pbolt)
 // electricity.
 bool bolt::can_affect_wall_monster(const monsters* mon) const
 {
+    if (is_enchantment())
+        return (true);
+
     const bool superconductor = (grd(mon->pos()) == DNGN_METAL_WALL
                                  && flavour == BEAM_ELECTRICITY);
     if (mons_wall_shielded(mon) && !superconductor)
         return (false);
 
+    if (!is_explosion && !is_big_cloud)
+        return (true);
+
     if (is_bouncy(grd(mon->pos())))
         return (false);
 
-    if (is_enchantment() || (!is_explosion && !is_big_cloud))
-        return (true);
-
     return (false);
 }