summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--crawl-ref/source/enum.h4
-rw-r--r--crawl-ref/source/ghost.cc2
-rw-r--r--crawl-ref/source/mstuff2.cc6
-rw-r--r--crawl-ref/source/newgame.cc2
-rw-r--r--crawl-ref/source/spl-book.cc12
-rw-r--r--crawl-ref/source/spl-cast.cc4
-rw-r--r--crawl-ref/source/spl-data.h4
-rw-r--r--crawl-ref/source/xom.cc4
8 files changed, 19 insertions, 19 deletions
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index 67d0957a2c..aafe14b992 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -2430,7 +2430,7 @@ enum spell_type
SPELL_REPEL_UNDEAD,
SPELL_HOLY_WORD,
SPELL_DETECT_CURSE,
- SPELL_SUMMON_SMALL_MAMMAL,
+ SPELL_SUMMON_SMALL_MAMMALS,
SPELL_ABJURATION_I, // 50
SPELL_SUMMON_SCORPIONS,
SPELL_LEVITATION,
@@ -2442,7 +2442,7 @@ enum spell_type
SPELL_DETECT_TRAPS,
SPELL_BLINK,
SPELL_ISKENDERUNS_MYSTIC_BLAST, // 60
- SPELL_SWARM,
+ SPELL_SUMMON_SWARM,
SPELL_SUMMON_HORRIBLE_THINGS,
SPELL_ENSLAVEMENT,
SPELL_MAGIC_MAPPING,
diff --git a/crawl-ref/source/ghost.cc b/crawl-ref/source/ghost.cc
index 0bbb45fb9b..6a5acb32ad 100644
--- a/crawl-ref/source/ghost.cc
+++ b/crawl-ref/source/ghost.cc
@@ -75,7 +75,7 @@ static spell_type search_order_third[] = {
/* 10 */
SPELL_INVISIBILITY,
SPELL_CALL_IMP,
- SPELL_SUMMON_SMALL_MAMMAL,
+ SPELL_SUMMON_SMALL_MAMMALS,
SPELL_CONTROLLED_BLINK,
SPELL_BLINK,
SPELL_NO_SPELL, // end search
diff --git a/crawl-ref/source/mstuff2.cc b/crawl-ref/source/mstuff2.cc
index 8370a35508..22a97cae09 100644
--- a/crawl-ref/source/mstuff2.cc
+++ b/crawl-ref/source/mstuff2.cc
@@ -540,9 +540,9 @@ void mons_cast(monsters *monster, bolt &pbolt, spell_type spell_cast)
monster->go_berserk(true);
return;
- case SPELL_SUMMON_SMALL_MAMMAL:
+ case SPELL_SUMMON_SMALL_MAMMALS:
case SPELL_VAMPIRE_SUMMON:
- if ( spell_cast == SPELL_SUMMON_SMALL_MAMMAL )
+ if (spell_cast == SPELL_SUMMON_SMALL_MAMMALS)
sumcount2 = 1 + random2(4);
else
sumcount2 = 3 + random2(3) + monster->hit_dice / 5;
@@ -885,7 +885,7 @@ void setup_mons_cast(const monsters *monster, struct bolt &pbolt, int spell_cast
// fire_tracer, or beam.
switch (spell_cast)
{
- case SPELL_SUMMON_SMALL_MAMMAL:
+ case SPELL_SUMMON_SMALL_MAMMALS:
case SPELL_GREATER_HEALING:
case SPELL_VAMPIRE_SUMMON:
case SPELL_SHADOW_CREATURES: // summon anything appropriate for level
diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc
index 0a76870f77..a4209aaf61 100644
--- a/crawl-ref/source/newgame.cc
+++ b/crawl-ref/source/newgame.cc
@@ -2420,7 +2420,7 @@ static void _give_basic_spells(job_type which_job)
which_spell = SPELL_STING;
break;
case JOB_SUMMONER:
- which_spell = SPELL_SUMMON_SMALL_MAMMAL;
+ which_spell = SPELL_SUMMON_SMALL_MAMMALS;
break;
case JOB_ICE_ELEMENTALIST:
which_spell = SPELL_FREEZE;
diff --git a/crawl-ref/source/spl-book.cc b/crawl-ref/source/spl-book.cc
index 3f0e043702..abaf0d2a4d 100644
--- a/crawl-ref/source/spl-book.cc
+++ b/crawl-ref/source/spl-book.cc
@@ -50,7 +50,7 @@ static spell_type spellbook_template_array[NUMBER_SPELLBOOKS][SPELLBOOK_SIZE] =
{
// 0 - Minor Magic I
{SPELL_MAGIC_DART,
- SPELL_SUMMON_SMALL_MAMMAL,
+ SPELL_SUMMON_SMALL_MAMMALS,
SPELL_THROW_FLAME,
SPELL_BLINK,
SPELL_SLOW,
@@ -70,7 +70,7 @@ static spell_type spellbook_template_array[NUMBER_SPELLBOOKS][SPELLBOOK_SIZE] =
},
// 2 - Minor Magic III
{SPELL_MAGIC_DART,
- SPELL_SUMMON_SMALL_MAMMAL,
+ SPELL_SUMMON_SMALL_MAMMALS,
SPELL_BLINK,
SPELL_REPEL_MISSILES,
SPELL_SLOW,
@@ -301,7 +301,7 @@ static spell_type spellbook_template_array[NUMBER_SPELLBOOKS][SPELLBOOK_SIZE] =
SPELL_NO_SPELL,
},
// 25 - Book of Callings
- {SPELL_SUMMON_SMALL_MAMMAL,
+ {SPELL_SUMMON_SMALL_MAMMALS,
SPELL_STICKS_TO_SNAKES,
SPELL_CALL_IMP,
SPELL_SUMMON_ELEMENTAL,
@@ -514,7 +514,7 @@ static spell_type spellbook_template_array[NUMBER_SPELLBOOKS][SPELLBOOK_SIZE] =
// 44 - Book of Cantrips //jmf: added 04jan2000
{SPELL_CONFUSING_TOUCH,
SPELL_ANIMATE_SKELETON,
- SPELL_SUMMON_SMALL_MAMMAL,
+ SPELL_SUMMON_SMALL_MAMMALS,
SPELL_DETECT_SECRET_DOORS,
SPELL_APPORTATION,
SPELL_NO_SPELL,
@@ -534,7 +534,7 @@ static spell_type spellbook_template_array[NUMBER_SPELLBOOKS][SPELLBOOK_SIZE] =
},
// 46 - Book of Beasts //jmf: added 19mar2000
- {SPELL_SUMMON_SMALL_MAMMAL,
+ {SPELL_SUMMON_SMALL_MAMMALS,
SPELL_STICKS_TO_SNAKES,
SPELL_DETECT_CREATURES,
SPELL_SUMMON_LARGE_MAMMAL,
@@ -594,7 +594,7 @@ static spell_type spellbook_template_array[NUMBER_SPELLBOOKS][SPELLBOOK_SIZE] =
{SPELL_ABJURATION_I,
SPELL_RECALL,
SPELL_SUMMON_ELEMENTAL,
- SPELL_SWARM,
+ SPELL_SUMMON_SWARM,
SPELL_NO_SPELL,
SPELL_NO_SPELL,
SPELL_NO_SPELL,
diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc
index 9fb62bbdf5..19d76a26fd 100644
--- a/crawl-ref/source/spl-cast.cc
+++ b/crawl-ref/source/spl-cast.cc
@@ -1333,7 +1333,7 @@ spret_type your_spells( spell_type spell, int powc, bool allow_fail )
detect_curse(false);
break;
- case SPELL_SUMMON_SMALL_MAMMAL:
+ case SPELL_SUMMON_SMALL_MAMMALS:
summon_small_mammals(powc); //jmf: hmm, that's definitely *plural* ;-)
break;
@@ -1392,7 +1392,7 @@ spret_type your_spells( spell_type spell, int powc, bool allow_fail )
return (SPRET_ABORT);
break;
- case SPELL_SWARM:
+ case SPELL_SUMMON_SWARM:
summon_swarm( powc, false, false );
break;
diff --git a/crawl-ref/source/spl-data.h b/crawl-ref/source/spl-data.h
index 7a1b0fa4cf..b632fef73a 100644
--- a/crawl-ref/source/spl-data.h
+++ b/crawl-ref/source/spl-data.h
@@ -642,7 +642,7 @@
},
{
- SPELL_SUMMON_SMALL_MAMMAL, "Summon Small Mammals",
+ SPELL_SUMMON_SMALL_MAMMALS, "Summon Small Mammals",
SPTYP_SUMMONING,
SPFLAG_NONE,
1,
@@ -770,7 +770,7 @@
},
{
- SPELL_SWARM, "Summon Swarm",
+ SPELL_SUMMON_SWARM, "Summon Swarm",
SPTYP_SUMMONING,
SPFLAG_NONE,
6,
diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc
index 182f43d33f..47b355d932 100644
--- a/crawl-ref/source/xom.cc
+++ b/crawl-ref/source/xom.cc
@@ -58,9 +58,9 @@ static const spell_type xom_spells[] =
SPELL_MAXWELLS_SILVER_HAMMER, SPELL_FIRE_BRAND, SPELL_FREEZING_AURA,
SPELL_POISON_WEAPON, SPELL_STONEMAIL, SPELL_WARP_BRAND,
SPELL_TUKIMAS_DANCE, SPELL_RECALL, SPELL_SUMMON_BUTTERFLIES,
- SPELL_SUMMON_SMALL_MAMMAL, SPELL_SUMMON_SCORPIONS, SPELL_FLY,
+ SPELL_SUMMON_SMALL_MAMMALS, SPELL_SUMMON_SCORPIONS, SPELL_FLY,
SPELL_SPIDER_FORM, SPELL_STATUE_FORM, SPELL_ICE_FORM, SPELL_DRAGON_FORM,
- SPELL_ANIMATE_DEAD, SPELL_SWARM, SPELL_SUMMON_WRAITHS,
+ SPELL_ANIMATE_DEAD, SPELL_SUMMON_SWARM, SPELL_SUMMON_WRAITHS,
SPELL_SHADOW_CREATURES, SPELL_SUMMON_HORRIBLE_THINGS,
SPELL_SUMMON_LARGE_MAMMAL, SPELL_SUMMON_ICE_BEAST, SPELL_SUMMON_UGLY_THING,
SPELL_CONJURE_BALL_LIGHTNING, SPELL_SUMMON_DRAGON, SPELL_DEATH_CHANNEL,
generated by cgit v1.2.3-54-g00ecf (git 2.45.1) at 2024-06-13 21:43:06 +0000