summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/spl-summoning.h
diff options
context:
space:
mode:
authorEd Gonzalez <ed.gonzalez3@gmail.com>2013-06-26 02:00:49 -0700
committerPete Hurst <pete@streamuniverse.tv>2013-06-26 17:31:31 +0100
commit84cbdbc3d473519238532f04bf0cd0b859b83d77 (patch)
tree2bd79fca58fcfef14696a033022d74dedfd920ab /crawl-ref/source/spl-summoning.h
parent2b2fa887ae752b55d2232950b11acaf50caf1d26 (diff)
downloadcrawl-ref-84cbdbc3d473519238532f04bf0cd0b859b83d77.tar.gz
crawl-ref-84cbdbc3d473519238532f04bf0cd0b859b83d77.zip
Make Spectral Weapon reset on player's next turn for real this time.
If the Spectral Weapon hasn't attacked by the player's next turn, it gets reset. This occurs either right before the next order is given to the weapon, or (if the player did something else) after the player's turn. Unlike 04540f5, this reset mechanism doesn't prevent the spectral weapon from ever attacking.
Diffstat (limited to 'crawl-ref/source/spl-summoning.h')
-rw-r--r--crawl-ref/source/spl-summoning.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/crawl-ref/source/spl-summoning.h b/crawl-ref/source/spl-summoning.h
index 138741b90f..c5fde0b557 100644
--- a/crawl-ref/source/spl-summoning.h
+++ b/crawl-ref/source/spl-summoning.h
@@ -98,6 +98,7 @@ void end_spectral_weapon(monster* mons, bool killed, bool quiet = false);
bool trigger_spectral_weapon(actor* agent, const actor* target);
bool check_target_spectral_weapon(const actor* mons, const actor *defender);
bool confirm_attack_spectral_weapon(monster* mons, const actor *defender);
+void reset_spectral_weapon(monster* mons);
bool summoned_monster(monster* mons, actor* caster, spell_type spell);
bool summons_are_capped(spell_type spell);