Overhaul god gift handling again so that we can tell which god sent

which gift.  There was an unused god parameter in the monsters struct, 
which was probably intended to hold which god a monster worshipped.  
I've used it as an indicator of which god sent the monster, under the 
assumption that gods would send their own worshippers as gifts.  (I hope 
this isn't an abuse of it.)


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

1 files changed, 15 insertions, 15 deletions

diff --git a/crawl-ref/source/spells2.h b/crawl-ref/source/spells2.h
index 12db20b0bc..8cd5b9cfb9 100644
--- a/crawl-ref/source/spells2.h
+++ b/crawl-ref/source/spells2.h
@@ -108,29 +108,29 @@ bool summon_animals(int pow);
 /* ***********************************************************************
  * called from: ability - spell
  * *********************************************************************** */
-bool cast_summon_butterflies(int pow, bool god_gift = false);
-bool cast_summon_small_mammals(int pow, bool god_gift = false);
-bool cast_sticks_to_snakes(int pow, bool god_gift = false);
-bool cast_summon_scorpions(int pow, bool god_gift = false);
+bool cast_summon_butterflies(int pow, god_type god = GOD_NO_GOD);
+bool cast_summon_small_mammals(int pow, god_type god = GOD_NO_GOD);
+bool cast_sticks_to_snakes(int pow, god_type god = GOD_NO_GOD);
+bool cast_summon_scorpions(int pow, god_type god = GOD_NO_GOD);
 
 // last updated 24may2000 {dlb}
 /* ***********************************************************************
  * called from: ability - religion - spell
  * *********************************************************************** */
-bool cast_summon_swarm(int pow, bool god_gift = false,
+bool cast_summon_swarm(int pow, god_type god = GOD_NO_GOD,
                        bool force_hostile = false);
 
 // last updated 24may2000 {dlb}
 /* ***********************************************************************
  * called from: ability - spell
  * *********************************************************************** */
-bool cast_call_canine_familiar(int pow, bool god_gift = false);
+bool cast_call_canine_familiar(int pow, god_type god = GOD_NO_GOD);
 
 // last updated 24may2000 {dlb}
 /* ***********************************************************************
  * called from: it_use3 - spell
  * *********************************************************************** */
-bool cast_summon_elemental(int pow, bool god_gift = false,
+bool cast_summon_elemental(int pow, god_type god = GOD_NO_GOD,
                            monster_type restricted_type = MONS_PROGRAM_BUG,
                            int unfriendly = 2);
 
@@ -138,31 +138,31 @@ bool cast_summon_elemental(int pow, bool god_gift = false,
 /* ***********************************************************************
  * called from: ability - spell
  * *********************************************************************** */
-bool cast_summon_ice_beast(int pow, bool god_gift = false);
-bool cast_summon_ugly_thing(int pow, bool god_gift = false);
-bool cast_summon_dragon(int pow, bool god_gift = false);
+bool cast_summon_ice_beast(int pow, god_type god = GOD_NO_GOD);
+bool cast_summon_ugly_thing(int pow, god_type god = GOD_NO_GOD);
+bool cast_summon_dragon(int pow, god_type god = GOD_NO_GOD);
 
 // last updated 24may2000 {dlb}
 /* ***********************************************************************
  * called from: ability - spell
  * *********************************************************************** */
-bool summon_berserker(int pow, bool god_gift = false,
+bool summon_berserker(int pow, god_type god = GOD_NO_GOD,
                       bool force_hostile = false);
-bool summon_guardian(int pow, bool god_gift = false, bool quiet = false);
-bool summon_daeva(int pow, bool god_gift = false, bool quiet = false);
+bool summon_guardian(int pow, god_type god = GOD_NO_GOD, bool quiet = false);
+bool summon_daeva(int pow, god_type god = GOD_NO_GOD, bool quiet = false);
 
 // last updated 24may2000 {dlb}
 /* ***********************************************************************
  * called from: ability - religion - spell
  * *********************************************************************** */
-bool cast_tukimas_dance(int pow, bool god_gift = false,
+bool cast_tukimas_dance(int pow, god_type god = GOD_NO_GOD,
                         bool force_hostile = false, bool quiet_failure = false);
 
 // last updated 24may2000 {dlb}
 /* ***********************************************************************
  * called from: ability - spell
  * *********************************************************************** */
-bool cast_conjure_ball_lightning(int pow, bool god_gift = false);
+bool cast_conjure_ball_lightning(int pow, god_type god = GOD_NO_GOD);
 
 // last updated 24may2000 {dlb}
 /* ***********************************************************************