diff options
| author | gammafunk <gammafunk@gmail.com> | 2013-09-26 19:41:53 -0500 |
|---|---|---|
| committer | Neil Moore <neil@s-z.org> | 2013-10-01 21:27:27 -0400 |
| commit | 5215da038daff4c36708ba59b59847e22a8ea665 (patch) | |
| tree | cb51f30e911254dcda4de5a75b9ef66d6aeaacf0 /crawl-ref/source/fight.h | |
| parent | 956008587f695d266932b699b947c2d37899559e (diff) | |
| download | crawl-ref-5215da038daff4c36708ba59b59847e22a8ea665.tar.gz crawl-ref-5215da038daff4c36708ba59b59847e22a8ea665.zip | |
Allow jump attack to target an empty square
The player can target an in-range empty square for jump attack. If it turns out
that the square is empty, the jump-attack fails and the player rebounds to their
original position, losing the turn.
Diffstat (limited to 'crawl-ref/source/fight.h')
| -rw-r--r-- | crawl-ref/source/fight.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/crawl-ref/source/fight.h b/crawl-ref/source/fight.h index a01ee21dc3..4cfae60f84 100644 --- a/crawl-ref/source/fight.h +++ b/crawl-ref/source/fight.h @@ -29,9 +29,9 @@ enum unchivalric_attack_type bool fight_melee(actor *attacker, actor *defender, bool *did_hit = NULL, bool simu = false); -bool fight_jump(actor *attacker, actor *defender, bool jump_blocked, +bool fight_jump(actor *attacker, actor *defender, coord_def attack_pos, coord_def landing_pos, set<coord_def> landing_sites, - bool *did_hit = NULL); + bool jump_blocked, bool *did_hit = NULL); int resist_adjust_damage(actor *defender, beam_type flavour, int res, int rawdamage, bool ranged = false); @@ -52,4 +52,6 @@ void attack_cleave_targets(actor* attacker, list<actor*> &targets, int effective_attack_number = 0); int finesse_adjust_delay(int delay); + +bool conduction_affected(const coord_def &pos); #endif |