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

diff --git a/crawl-ref/source/mgen_enum.h b/crawl-ref/source/mgen_enum.h
index d7b064978b..233f6c0801 100644
--- a/crawl-ref/source/mgen_enum.h
+++ b/crawl-ref/source/mgen_enum.h
@@ -107,6 +107,16 @@ enum band_type
     BAND_NAGA_SHARPSHOOTER,
     BAND_SALAMANDERS,
     BAND_SALAMANDER_ELITES,
+    BAND_MONSTROUS_DEMONSPAWN,
+    BAND_GELID_DEMONSPAWN,
+    BAND_INFERNAL_DEMONSPAWN,
+    BAND_PUTRID_DEMONSPAWN,
+    BAND_TORTUROUS_DEMONSPAWN,
+    BAND_BLOOD_SAINT,
+    BAND_CHAOS_CHAMPION,
+    BAND_WARMONGER,
+    BAND_CORRUPTER,
+    BAND_BLACK_SUN,
     NUM_BANDS                   // always last
 };