Merge branch 'demonspawn-enemies'

With the forest dispersal work done, and with everything working up to
the original designer's standards, this is ready for trunk.

Conflicts:
	crawl-ref/source/beam.cc
	crawl-ref/source/dat/des/branches/pan.des
	crawl-ref/source/enum.h
	crawl-ref/source/hiscores.cc
	crawl-ref/source/melee_attack.cc
	crawl-ref/source/mgen_enum.h
	crawl-ref/source/mon-cast.cc
	crawl-ref/source/mon-data.h
	crawl-ref/source/mon-ench.cc
	crawl-ref/source/mon-info.cc
	crawl-ref/source/mon-info.h
	crawl-ref/source/mon-place.cc
	crawl-ref/source/mon-spll.h
	crawl-ref/source/mon-stuff.cc
	crawl-ref/source/mon-util.cc
	crawl-ref/source/mutation.cc
	crawl-ref/source/output.cc
	crawl-ref/source/player.cc
	crawl-ref/source/spl-data.h
	crawl-ref/source/status.cc
	crawl-ref/source/wiz-you.cc

1 files changed, 2 insertions, 2 deletions

diff --git a/crawl-ref/source/cloud.cc b/crawl-ref/source/cloud.cc
index c7fcab100b..05a9591e41 100644
--- a/crawl-ref/source/cloud.cc
+++ b/crawl-ref/source/cloud.cc
@@ -1094,8 +1094,8 @@ int actor_apply_cloud(actor *act)
         maybe_id_resist(cloud_flavour);
     }
 
-    if (player && cloud_flavour != BEAM_NONE)
-        expose_player_to_element(cloud_flavour, 7, true, false);
+    if (cloud_flavour != BEAM_NONE)
+        act->expose_to_element(cloud_flavour, 7, true, false);
 
     const bool side_effects =
         _actor_apply_cloud_side_effects(act, cloud, final_damage);