diff options
| author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-02 09:21:55 +0000 |
|---|---|---|
| committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-02 09:21:55 +0000 |
| commit | 145574d7faad160fb212d68a693454ea08d59b4f (patch) | |
| tree | 67a2d4fd8b2f289d9210dd428aca84c6c405a84b /crawl-ref/source/item_use.cc | |
| parent | 99fcce0830ca9642fdc2dd8c35d9e1ac3b788116 (diff) | |
| download | crawl-ref-145574d7faad160fb212d68a693454ea08d59b4f.tar.gz crawl-ref-145574d7faad160fb212d68a693454ea08d59b4f.zip | |
Fix [2481621]: positive self-targeting enchantments prompted.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8112 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/item_use.cc')
| -rw-r--r-- | crawl-ref/source/item_use.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index 66a0f6c252..d2853448af 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -3541,12 +3541,13 @@ void zap_wand(int slot) beam.source = you.pos(); beam.set_target(zap_wand); - beam.aimed_at_feet = (beam.target == you.pos()); + + bool aimed_at_self = (beam.target == you.pos()); // Check whether we may hit friends, use "safe" values for random effects // and unknown wands (highest possible range, and unresistable beam // flavour). Don't use the tracer if firing at self. - if (!beam.aimed_at_feet) + if (!aimed_at_self) { beam.range = tracer_range; if (!player_tracer(beam.effect_known ? type_zapped @@ -3562,7 +3563,7 @@ void zap_wand(int slot) // and yourself, unless there's a nearby invisible enemy and you're // trying to hit it at random. const bool risky = dangerous && (beam.fr_count || beam.foe_count - || invis_enemy || beam.aimed_at_feet); + || invis_enemy || aimed_at_self); if (risky && alreadyknown && wand.sub_type == WAND_RANDOM_EFFECTS) { |