Start cleaning up summoning routines in a better way. Sorry for the

mess in the meantime.


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

1 files changed, 7 insertions, 2 deletions

diff --git a/crawl-ref/source/spells2.h b/crawl-ref/source/spells2.h
index cd7a368d0d..d06a3b2e3b 100644
--- a/crawl-ref/source/spells2.h
+++ b/crawl-ref/source/spells2.h
@@ -132,6 +132,10 @@ bool restore_stat(unsigned char which_stat, unsigned char stat_gain,
 /* ***********************************************************************
  * called from: ability - spell
  * *********************************************************************** */
+bool cast_summon_butterflies(int pow, bool god_gift = false);
+
+bool cast_summon_scorpions(int pow, bool god_gift = false);
+
 bool summon_general_creature_spell(spell_type spell, int pow,
                                    bool god_gift = false);
 
@@ -153,13 +157,14 @@ void summon_animals(int pow);
  * *********************************************************************** */
 void summon_small_mammals(int pow);
 
-bool summon_berserker(int pow, beh_type beha, bool god_gift);
+bool summon_berserker(int pow, bool force_hostile = false);
 
 // last updated 24may2000 {dlb}
 /* ***********************************************************************
  * called from: ability - religion - spell
  * *********************************************************************** */
-bool summon_swarm(int pow, beh_type beha, bool god_gift);
+bool summon_swarm(int pow, bool god_gift = false, bool force_hostile = false,
+                  bool quiet = false);
 
 
 // last updated 24may2000 {dlb}