summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/spl-summoning.h
diff options
context:
space:
mode:
authorelliptic <hyperelliptical@gmail.com>2013-02-09 10:22:23 -0500
committerelliptic <hyperelliptical@gmail.com>2013-02-09 10:22:23 -0500
commit17e404e6b80b694f3b096e10566b82772db1c862 (patch)
tree9bf3259e54dea6c1c6457a0a811bf8873d2089c2 /crawl-ref/source/spl-summoning.h
parentadbe6da1619774eb9e4a29fd7c0a5336329ee759 (diff)
downloadcrawl-ref-17e404e6b80b694f3b096e10566b82772db1c862.tar.gz
crawl-ref-17e404e6b80b694f3b096e10566b82772db1c862.zip
Rename arcane familiar to battlesphere.
The word "familiar" suggests a summon rather than a magical construct; this spell is much more like Conjure Ball Lightning than Call Canine Familiar. Since the suggestion "battlesphere" has met with great approval (or at least nobody has come up with better), let's use that.
Diffstat (limited to 'crawl-ref/source/spl-summoning.h')
-rw-r--r--crawl-ref/source/spl-summoning.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/crawl-ref/source/spl-summoning.h b/crawl-ref/source/spl-summoning.h
index f92b2b27d9..88df705fd9 100644
--- a/crawl-ref/source/spl-summoning.h
+++ b/crawl-ref/source/spl-summoning.h
@@ -82,12 +82,12 @@ spret_type cast_haunt(int pow, const coord_def& where, god_type god, bool fail);
spret_type cast_abjuration(int pow, const coord_def& where, bool fail = false);
spret_type cast_mass_abjuration(int pow, bool fail = false);
-spret_type cast_arcane_familiar(int pow, god_type god, bool fail);
-void end_arcane_familiar(bool killed);
-bool aim_arcane_familiar(spell_type spell, int powc, bolt& beam);
-bool trigger_arcane_familiar(bolt& beam);
-bool fire_arcane_familiar(monster* mons);
-void reset_arcane_familiar(monster* mons);
+spret_type cast_battlesphere(int pow, god_type god, bool fail);
+void end_battlesphere(bool killed);
+bool aim_battlesphere(spell_type spell, int powc, bolt& beam);
+bool trigger_battlesphere(bolt& beam);
+bool fire_battlesphere(monster* mons);
+void reset_battlesphere(monster* mons);
spret_type cast_fulminating_prism(int pow, const coord_def& where, bool fail);
#endif