diff options
| author | DracoOmega <draco_omega@live.com> | 2014-02-13 22:01:47 -0330 |
|---|---|---|
| committer | DracoOmega <draco_omega@live.com> | 2014-02-13 22:01:47 -0330 |
| commit | 8b692751aca0bde2d58bdba056c6b94661c3011b (patch) | |
| tree | d1bc81cf4af2cd5462fc563525b7d9da8a620e87 /crawl-ref/source/spl-summoning.h | |
| parent | 230ef3e62244bdff6adcb585676b0469e80f8b10 (diff) | |
| parent | b78098f4675f43661c4eadc0437d3c15462a63e2 (diff) | |
| download | crawl-ref-8b692751aca0bde2d58bdba056c6b94661c3011b.tar.gz crawl-ref-8b692751aca0bde2d58bdba056c6b94661c3011b.zip | |
Merge branch 'master' into summon_spells
Conflicts:
crawl-ref/source/enum.h
crawl-ref/source/spl-data.h
crawl-ref/source/spl-summoning.cc
Diffstat (limited to 'crawl-ref/source/spl-summoning.h')
| -rw-r--r-- | crawl-ref/source/spl-summoning.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crawl-ref/source/spl-summoning.h b/crawl-ref/source/spl-summoning.h index 5552637f2d..aa8d68c690 100644 --- a/crawl-ref/source/spl-summoning.h +++ b/crawl-ref/source/spl-summoning.h @@ -96,6 +96,7 @@ spret_type cast_mass_abjuration(int pow, bool fail = false); 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); +bool battlesphere_can_mirror(spell_type spell); bool aim_battlesphere(actor* agent, spell_type spell, int powc, bolt& beam); bool trigger_battlesphere(actor* agent, bolt& beam); bool fire_battlesphere(monster* mons); |