summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/mstuff2.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-10 07:23:11 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-10 07:23:11 +0000
commitd1fc8ce5c863a2cd9d0bfb4571e56f4065b7af6c (patch)
tree66ae02fa5578d00c07e599877285b335916ea47b /crawl-ref/source/mstuff2.cc
parent5fa3929b28b5d95811818871a7c8053acd6ea54a (diff)
downloadcrawl-ref-d1fc8ce5c863a2cd9d0bfb4571e56f4065b7af6c.tar.gz
crawl-ref-d1fc8ce5c863a2cd9d0bfb4571e56f4065b7af6c.zip
Reorganize a bit.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5695 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/mstuff2.cc')
-rw-r--r--crawl-ref/source/mstuff2.cc30
1 files changed, 15 insertions, 15 deletions
diff --git a/crawl-ref/source/mstuff2.cc b/crawl-ref/source/mstuff2.cc
index 80c2a6393a..99c4052b3b 100644
--- a/crawl-ref/source/mstuff2.cc
+++ b/crawl-ref/source/mstuff2.cc
@@ -591,21 +591,6 @@ void mons_cast(monsters *monster, bolt &pbolt, spell_type spell_cast)
}
return;
- case SPELL_SUMMON_SCORPIONS:
- if (_mons_abjured(monster, monsterNearby))
- return;
-
- sumcount2 = 1 + random2(3) + random2( monster->hit_dice / 5 + 1 );
-
- duration = std::min(2 + monster->hit_dice / 5, 6);
- for (sumcount = 0; sumcount < sumcount2; sumcount++)
- {
- create_monster(
- mgen_data( MONS_SCORPION, SAME_ATTITUDE(monster), duration,
- monster->pos(), monster->foe, flags ));
- }
- return;
-
case SPELL_SHADOW_CREATURES: // summon anything appropriate for level
if (_mons_abjured(monster, monsterNearby))
return;
@@ -685,6 +670,21 @@ void mons_cast(monsters *monster, bolt &pbolt, spell_type spell_cast)
}
return;
+ case SPELL_SUMMON_SCORPIONS:
+ if (_mons_abjured(monster, monsterNearby))
+ return;
+
+ sumcount2 = 1 + random2(3) + random2( monster->hit_dice / 5 + 1 );
+
+ duration = std::min(2 + monster->hit_dice / 5, 6);
+ for (sumcount = 0; sumcount < sumcount2; sumcount++)
+ {
+ create_monster(
+ mgen_data( MONS_SCORPION, SAME_ATTITUDE(monster), duration,
+ monster->pos(), monster->foe, flags ));
+ }
+ return;
+
case SPELL_SUMMON_UFETUBUS:
sumcount2 = 2 + random2(2) + random2( monster->hit_dice / 5 + 1 );