summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/abl-show.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-08 02:44:57 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-08 02:44:57 +0000
commitaa81a23dd84ce7019956684a2d9010ccc7804f78 (patch)
tree6bb38815f1f127f6cb453ede88afc749e7411e21 /crawl-ref/source/abl-show.cc
parent42834623f58aaedb7a30a9e147d5bce0570860f8 (diff)
downloadcrawl-ref-aa81a23dd84ce7019956684a2d9010ccc7804f78.tar.gz
crawl-ref-aa81a23dd84ce7019956684a2d9010ccc7804f78.zip
Consolidate the demon-summoning routines again.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5572 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/abl-show.cc')
-rw-r--r--crawl-ref/source/abl-show.cc13
1 files changed, 7 insertions, 6 deletions
diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc
index 040c579c5d..0591520d59 100644
--- a/crawl-ref/source/abl-show.cc
+++ b/crawl-ref/source/abl-show.cc
@@ -1277,7 +1277,7 @@ static bool _do_ability(const ability_def& abil)
// DEMONIC POWERS:
case ABIL_SUMMON_MINOR_DEMON:
- summon_minor_demon(you.experience_level * 4);
+ summon_lesser_demon(you.experience_level * 4);
break;
case ABIL_SUMMON_DEMON:
@@ -1456,7 +1456,8 @@ static bool _do_ability(const ability_def& abil)
break;
case ABIL_KIKU_INVOKE_DEATH:
- summon_demon(MONS_REAPER, 20 + you.skills[SK_INVOCATIONS] * 3, true);
+ summon_demon_type(MONS_REAPER,
+ 20 + you.skills[SK_INVOCATIONS] * 3, true);
exercise(SK_INVOCATIONS, 10 + random2(14));
break;
@@ -1536,8 +1537,8 @@ static bool _do_ability(const ability_def& abil)
break;
case ABIL_MAKHLEB_LESSER_SERVANT_OF_MAKHLEB:
- summon_demon(static_cast<monster_type>(MONS_NEQOXEC + random2(5)),
- 20 + you.skills[SK_INVOCATIONS] * 3, true);
+ summon_demon_type(static_cast<monster_type>(MONS_NEQOXEC + random2(5)),
+ 20 + you.skills[SK_INVOCATIONS] * 3, true);
exercise(SK_INVOCATIONS, 2 + random2(3));
break;
@@ -1595,8 +1596,8 @@ static bool _do_ability(const ability_def& abil)
break;
case ABIL_MAKHLEB_GREATER_SERVANT_OF_MAKHLEB:
- summon_demon(static_cast<monster_type>(MONS_EXECUTIONER + random2(5)),
- 20 + you.skills[SK_INVOCATIONS] * 3, true);
+ summon_demon_type(static_cast<monster_type>(MONS_EXECUTIONER + random2(5)),
+ 20 + you.skills[SK_INVOCATIONS] * 3, true);
exercise(SK_INVOCATIONS, 6 + random2(6));
break;