summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/fight.cc
diff options
context:
space:
mode:
authorgammafunk <gammafunk@gmail.com>2013-09-29 21:34:14 -0500
committerNeil Moore <neil@s-z.org>2013-10-01 21:27:30 -0400
commitc9c39b457718f258cbaf1fbbccc4b6e64a25bb4e (patch)
tree622683c831e045aa30f81ddb0f6cb18773c12a40 /crawl-ref/source/fight.cc
parent242c44385c9b9e660fd9603ada90e7a955d56330 (diff)
downloadcrawl-ref-c9c39b457718f258cbaf1fbbccc4b6e64a25bb4e.tar.gz
crawl-ref-c9c39b457718f258cbaf1fbbccc4b6e64a25bb4e.zip
Fix conduct prompting for jump attacks with elec/devastator.
Warnings were not being generated for non-adjacent jump attacks and some double-prompting occured for adjacent ones.
Diffstat (limited to 'crawl-ref/source/fight.cc')
-rw-r--r--crawl-ref/source/fight.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index 7d3b484189..b529a329a6 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -355,6 +355,7 @@ bool fight_jump(actor *attacker, actor *defender, coord_def attack_pos,
targetter_smite hitfunc(attacker, 1, 1, 1, false, aff_func);
hitfunc.set_aim(attack_pos);
+ hitfunc.origin = *site;
if (stop_attack_prompt(hitfunc, verb, nullptr,
&conduct_prompted))