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, 1 insertions, 0 deletions

diff --git a/crawl-ref/source/melee_attack.h b/crawl-ref/source/melee_attack.h
index 0ee2fb7ea6..b2bdfe81a0 100644
--- a/crawl-ref/source/melee_attack.h
+++ b/crawl-ref/source/melee_attack.h
@@ -151,6 +151,7 @@ private:
     void mons_do_poison();
     void mons_do_napalm();
     void mons_do_eyeball_confusion();
+    void apply_black_mark_effects();
 
     attack_flavour random_chaos_attack_flavour();
 private: