summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/spl-summoning.h
diff options
context:
space:
mode:
authorEd Gonzalez <ed.gonzalez3@gmail.com>2013-06-12 01:41:07 -0700
committerEd Gonzalez <ed.gonzalez3@gmail.com>2013-06-12 01:41:07 -0700
commit8793e2d34f3455f35aaa2e218dd353668c3d0565 (patch)
tree70f7a97ae172e0dde5f6ccab08a60a56d076ccd2 /crawl-ref/source/spl-summoning.h
parentd8a42ea553226ec60eab4583a0f720fa2d07a1cd (diff)
downloadcrawl-ref-8793e2d34f3455f35aaa2e218dd353668c3d0565.tar.gz
crawl-ref-8793e2d34f3455f35aaa2e218dd353668c3d0565.zip
Encapsulate some spectral weapon code in functions in spl-summoning.h
Finding the spectral weapon now has its own function, which is reused in a number of places. Ending the spectral weapon is handled similar to battlesphere, and now clears the player property pertaining to the spectral weapon.
Diffstat (limited to 'crawl-ref/source/spl-summoning.h')
-rw-r--r--crawl-ref/source/spl-summoning.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/crawl-ref/source/spl-summoning.h b/crawl-ref/source/spl-summoning.h
index 82ba5bd771..c305690722 100644
--- a/crawl-ref/source/spl-summoning.h
+++ b/crawl-ref/source/spl-summoning.h
@@ -81,8 +81,6 @@ 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_spectral_weapon(int pow, bool fail);
-
monster* find_battlesphere(const actor* agent);
spret_type cast_battlesphere(actor* agent, int pow, god_type god, bool fail);
void end_battlesphere(monster* mons, bool killed);
@@ -92,4 +90,8 @@ bool fire_battlesphere(monster* mons);
void reset_battlesphere(monster* mons);
spret_type cast_fulminating_prism(int pow, const coord_def& where, bool fail);
+
+monster* find_spectral_weapon(const actor* agent);
+spret_type cast_spectral_weapon(int pow, bool fail);
+void end_spectral_weapon(monster* mons, bool killed, bool quiet=false);
#endif