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, 6 insertions, 5 deletions

diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc
index c462265d16..3ce63a4a6b 100644
--- a/crawl-ref/source/abl-show.cc
+++ b/crawl-ref/source/abl-show.cc
@@ -1458,14 +1458,15 @@ static bool _do_ability(const ability_def& abil)
 
     case ABIL_KIKU_INVOKE_DEATH:
         summon_demon_type(MONS_REAPER,
-                          20 + you.skills[SK_INVOCATIONS] * 3, true);
+                          20 + you.skills[SK_INVOCATIONS] * 3,
+                          GOD_KIKUBAAQUDGHA);
         exercise(SK_INVOCATIONS, 10 + random2(14));
         break;
 
     case ABIL_YRED_ANIMATE_CORPSE:
         mpr("You call on the dead to walk for you...");
         animate_a_corpse(you.x_pos, you.y_pos, CORPSE_BODY, BEH_FRIENDLY,
-                         you.pet_target, true);
+                         you.pet_target, GOD_YREDELEMNUL);
         exercise(SK_INVOCATIONS, 2 + random2(4));
         break;
 
@@ -1477,7 +1478,7 @@ static bool _do_ability(const ability_def& abil)
     case ABIL_YRED_ANIMATE_DEAD:
         mpr("You call on the dead to walk for you...");
         animate_dead(&you, 1 + you.skills[SK_INVOCATIONS], BEH_FRIENDLY,
-                     you.pet_target, true);
+                     you.pet_target, GOD_YREDELEMNUL);
         exercise(SK_INVOCATIONS, 2 + random2(4));
         break;
 
@@ -1535,7 +1536,7 @@ static bool _do_ability(const ability_def& abil)
 
     case ABIL_MAKHLEB_LESSER_SERVANT_OF_MAKHLEB:
         summon_demon_type(static_cast<monster_type>(MONS_NEQOXEC + random2(5)),
-                          20 + you.skills[SK_INVOCATIONS] * 3, true);
+                          20 + you.skills[SK_INVOCATIONS] * 3, GOD_MAKHLEB);
         exercise(SK_INVOCATIONS, 2 + random2(3));
         break;
 
@@ -1594,7 +1595,7 @@ static bool _do_ability(const ability_def& abil)
 
     case ABIL_MAKHLEB_GREATER_SERVANT_OF_MAKHLEB:
         summon_demon_type(static_cast<monster_type>(MONS_EXECUTIONER + random2(5)),
-                          20 + you.skills[SK_INVOCATIONS] * 3, true);
+                          20 + you.skills[SK_INVOCATIONS] * 3, GOD_MAKHLEB);
         exercise(SK_INVOCATIONS, 6 + random2(6));
         break;