diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-07 17:50:50 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-07 17:50:50 +0000 |
| commit | 3d8076086374c98bb2e90d342803f173d7cffd87 (patch) | |
| tree | fc1cf4b17ce4c6e3004c4271b4321ad94af8795f /crawl-ref/source/spl-cast.cc | |
| parent | f679a5b0cc0a5ea257b4cf2a618adca9d0b8c0db (diff) | |
| download | crawl-ref-3d8076086374c98bb2e90d342803f173d7cffd87.tar.gz crawl-ref-3d8076086374c98bb2e90d342803f173d7cffd87.zip | |
Start cleaning up summoning routines in a better way. Sorry for the
mess in the meantime.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5545 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/spl-cast.cc')
| -rw-r--r-- | crawl-ref/source/spl-cast.cc | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc index 155e585109..a561062fbc 100644 --- a/crawl-ref/source/spl-cast.cc +++ b/crawl-ref/source/spl-cast.cc @@ -1388,10 +1388,6 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail) return (SPRET_ABORT); break; - case SPELL_SUMMON_SWARM: - summon_swarm(powc, BEH_FRIENDLY, false); - break; - case SPELL_SUMMON_HORRIBLE_THINGS: summon_things(powc); break; @@ -1479,9 +1475,19 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail) return (SPRET_ABORT); break; - // Remember that most holy spells don't yet use powc! case SPELL_SUMMON_BUTTERFLIES: + cast_summon_butterflies(powc); + break; + case SPELL_SUMMON_SCORPIONS: + cast_summon_scorpions(powc); + break; + + case SPELL_SUMMON_SWARM: + summon_swarm(powc); + break; + + // Remember that most holy spells don't yet use powc! case SPELL_CALL_IMP: case SPELL_SUMMON_DEMON: case SPELL_DEMONIC_HORDE: @@ -1562,7 +1568,7 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail) case SPELL_TUKIMAS_DANCE: crawl_state.cant_cmd_repeat("You can't repeat dancing weapon."); - dancing_weapon(powc, false); + dancing_weapon(powc); break; case SPELL_HELLFIRE: |