summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/abl-show.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-08 00:47:51 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-08 00:47:51 +0000
commit1dc5deb5bc7fff6688670f19a76fdacae1136a6a (patch)
tree0d313826e0ab411da8123e9051bc8fa7bc339f26 /crawl-ref/source/abl-show.cc
parentb857cd3be4fe4adcf3a5abcf83d9873439dc1ab1 (diff)
downloadcrawl-ref-1dc5deb5bc7fff6688670f19a76fdacae1136a6a.tar.gz
crawl-ref-1dc5deb5bc7fff6688670f19a76fdacae1136a6a.zip
Simplify summoning of hostile demons.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5566 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/abl-show.cc')
-rw-r--r--crawl-ref/source/abl-show.cc15
1 files changed, 6 insertions, 9 deletions
diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc
index edd6fd5902..3a35f4ac77 100644
--- a/crawl-ref/source/abl-show.cc
+++ b/crawl-ref/source/abl-show.cc
@@ -1281,7 +1281,7 @@ static bool _do_ability(const ability_def& abil)
break;
case ABIL_SUMMON_DEMON:
- summon_demon(you.experience_level * 4);
+ summon_common_demon(you.experience_level * 4);
break;
case ABIL_HELLFIRE:
@@ -1456,8 +1456,7 @@ static bool _do_ability(const ability_def& abil)
break;
case ABIL_KIKU_INVOKE_DEATH:
- summon_specific_demon(MONS_REAPER,
- 20 + you.skills[SK_INVOCATIONS] * 3, true);
+ summon_demon(MONS_REAPER, 20 + you.skills[SK_INVOCATIONS] * 3);
exercise(SK_INVOCATIONS, 10 + random2(14));
break;
@@ -1537,9 +1536,8 @@ static bool _do_ability(const ability_def& abil)
break;
case ABIL_MAKHLEB_LESSER_SERVANT_OF_MAKHLEB:
- summon_specific_demon(static_cast<monster_type>(
- MONS_NEQOXEC + random2(5)),
- 20 + you.skills[SK_INVOCATIONS] * 3, true);
+ summon_demon(static_cast<monster_type>(MONS_NEQOXEC + random2(5)),
+ 20 + you.skills[SK_INVOCATIONS] * 3);
exercise(SK_INVOCATIONS, 2 + random2(3));
break;
@@ -1597,9 +1595,8 @@ static bool _do_ability(const ability_def& abil)
break;
case ABIL_MAKHLEB_GREATER_SERVANT_OF_MAKHLEB:
- summon_specific_demon(static_cast<monster_type>(
- MONS_EXECUTIONER + random2(5)),
- 20 + you.skills[SK_INVOCATIONS] * 3, true);
+ summon_demon(static_cast<monster_type>(MONS_EXECUTIONER + random2(5)),
+ 20 + you.skills[SK_INVOCATIONS] * 3);
exercise(SK_INVOCATIONS, 6 + random2(6));
break;