summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/spl-cast.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-07 02:50:50 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-07 02:50:50 +0000
commit2e6841ee13ce4787a2e4fa536c801c3660e00810 (patch)
tree53b1832ee7adc7bb84c3a791dce323e9eb95acd0 /crawl-ref/source/spl-cast.cc
parentb5cae5c2a0c46a219e917ec74ade02bab9301d63 (diff)
downloadcrawl-ref-2e6841ee13ce4787a2e4fa536c801c3660e00810.tar.gz
crawl-ref-2e6841ee13ce4787a2e4fa536c801c3660e00810.zip
Simplify even further.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5516 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/spl-cast.cc')
-rw-r--r--crawl-ref/source/spl-cast.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc
index bce84c7c53..68c134bec8 100644
--- a/crawl-ref/source/spl-cast.cc
+++ b/crawl-ref/source/spl-cast.cc
@@ -1489,6 +1489,7 @@ spret_type your_spells( spell_type spell, int powc, bool allow_fail )
// Remember that most holy spells don't yet use powc!
case SPELL_CALL_IMP:
+ case SPELL_SUMMON_DEMON:
case SPELL_SUMMON_ICE_BEAST:
case SPELL_SUMMON_GUARDIAN:
case SPELL_SUMMON_DAEVA:
@@ -1504,6 +1505,11 @@ spret_type your_spells( spell_type spell, int powc, bool allow_fail )
: MONS_IMP;
break;
+ case SPELL_SUMMON_DEMON:
+ mpr("You open a gate to Pandemonium!");
+ mon = summon_any_demon(DEMON_COMMON);
+ break;
+
case SPELL_SUMMON_ICE_BEAST:
mon = MONS_ICE_BEAST;
break;
@@ -1610,12 +1616,6 @@ spret_type your_spells( spell_type spell, int powc, bool allow_fail )
return (SPRET_ABORT);
break;
- case SPELL_SUMMON_DEMON:
- mpr("You open a gate to Pandemonium!");
- summon_general_creature(powc, summon_any_demon(DEMON_COMMON),
- BEH_FRIENDLY, false);
- break;
-
case SPELL_DEMONIC_HORDE:
mpr("You open a gate to Pandemonium!");
{