diff options
| -rw-r--r-- | crawl-ref/source/it_use3.cc | 6 | ||||
| -rw-r--r-- | crawl-ref/source/spells2.cc | 6 | ||||
| -rw-r--r-- | crawl-ref/source/spells2.h | 21 | ||||
| -rw-r--r-- | crawl-ref/source/spl-cast.cc | 2 |
4 files changed, 20 insertions, 15 deletions
diff --git a/crawl-ref/source/it_use3.cc b/crawl-ref/source/it_use3.cc index c5a5d5bec1..5f257fb335 100644 --- a/crawl-ref/source/it_use3.cc +++ b/crawl-ref/source/it_use3.cc @@ -621,7 +621,7 @@ bool evoke_wielded() canned_msg(MSG_NOTHING_HAPPENS); else { - summon_elemental(100, false, MONS_AIR_ELEMENTAL, 4); + cast_summon_elemental(100, false, MONS_AIR_ELEMENTAL, 4); pract = (one_chance_in(5) ? 1 : 0); } break; @@ -631,7 +631,7 @@ bool evoke_wielded() canned_msg(MSG_NOTHING_HAPPENS); else { - summon_elemental(100, false, MONS_FIRE_ELEMENTAL, 4); + cast_summon_elemental(100, false, MONS_FIRE_ELEMENTAL, 4); pract = (one_chance_in(5) ? 1 : 0); } break; @@ -641,7 +641,7 @@ bool evoke_wielded() canned_msg(MSG_NOTHING_HAPPENS); else { - summon_elemental(100, false, MONS_EARTH_ELEMENTAL, 4); + cast_summon_elemental(100, false, MONS_EARTH_ELEMENTAL, 4); pract = (one_chance_in(5) ? 1 : 0); } break; diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc index 4346627113..0a54720815 100644 --- a/crawl-ref/source/spells2.cc +++ b/crawl-ref/source/spells2.cc @@ -1405,9 +1405,9 @@ bool cast_call_canine_familiar(int pow, bool god_gift) // postal on the caster (after taking into account // chance of that happening to unskilled casters // anyway). -bool summon_elemental(int pow, bool god_gift, - monster_type restricted_type, - int unfriendly) +bool cast_summon_elemental(int pow, bool god_gift, + monster_type restricted_type, + int unfriendly) { monster_type mon = MONS_PROGRAM_BUG; diff --git a/crawl-ref/source/spells2.h b/crawl-ref/source/spells2.h index d8d62c9f27..12db20b0bc 100644 --- a/crawl-ref/source/spells2.h +++ b/crawl-ref/source/spells2.h @@ -39,14 +39,6 @@ char burn_freeze(int pow, beam_type b_f); int corpse_rot(int power); -// last updated 24may2000 {dlb} -/* *********************************************************************** - * called from: it_use3 - spell - * *********************************************************************** */ -bool summon_elemental(int pow, bool god_gift = false, - monster_type restricted_type = MONS_PROGRAM_BUG, - int unfriendly = 2); - struct dist; // last updated 24may2000 {dlb} /* *********************************************************************** @@ -133,6 +125,19 @@ bool cast_summon_swarm(int pow, bool god_gift = false, * called from: ability - spell * *********************************************************************** */ bool cast_call_canine_familiar(int pow, bool god_gift = false); + +// last updated 24may2000 {dlb} +/* *********************************************************************** + * called from: it_use3 - spell + * *********************************************************************** */ +bool cast_summon_elemental(int pow, bool god_gift = false, + monster_type restricted_type = MONS_PROGRAM_BUG, + int unfriendly = 2); + +// last updated 24may2000 {dlb} +/* *********************************************************************** + * called from: ability - spell + * *********************************************************************** */ bool cast_summon_ice_beast(int pow, bool god_gift = false); bool cast_summon_ugly_thing(int pow, bool god_gift = false); bool cast_summon_dragon(int pow, bool god_gift = false); diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc index 6140c8b0e9..4a8bed7ba3 100644 --- a/crawl-ref/source/spl-cast.cc +++ b/crawl-ref/source/spl-cast.cc @@ -1445,7 +1445,7 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail) break; case SPELL_SUMMON_ELEMENTAL: - if (!summon_elemental(powc, god_gift)) + if (!cast_summon_elemental(powc, god_gift)) return (SPRET_ABORT); break; |