diff options
| author | Charles Otto <ottochar@gmail.com> | 2009-10-06 22:27:07 -0400 |
|---|---|---|
| committer | Charles Otto <ottochar@gmail.com> | 2009-10-06 22:31:25 -0400 |
| commit | c2c25b5eaa191b0d26aee47359949093367154b9 (patch) | |
| tree | 6ac6a73ff6053f17fce2e66e8e441978c2729d36 /crawl-ref/source/item_use.cc | |
| parent | 0e2154d50e2de944bb1495b6ad4a62112ee97f03 (diff) | |
| download | crawl-ref-c2c25b5eaa191b0d26aee47359949093367154b9.tar.gz crawl-ref-c2c25b5eaa191b0d26aee47359949093367154b9.zip | |
Implement FR 2872334 'don't auto-target neutrals' by replacing most uses of TARG_ENEMY with TARG_HOSTILE.
Diffstat (limited to 'crawl-ref/source/item_use.cc')
| -rw-r--r-- | crawl-ref/source/item_use.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index 052e126761..440728ac2f 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -1337,7 +1337,7 @@ static bool _fire_choose_item_and_target(int& slot, dist& target, // XXX: This stuff should be done by direction()! message_current_target(); - direction( target, DIR_NONE, TARG_ENEMY, -1, false, !teleport, true, false, + direction( target, DIR_NONE, TARG_HOSTILE, -1, false, !teleport, true, false, NULL, &beh ); if (beh.m_slot == -1) @@ -2231,7 +2231,7 @@ bool throw_it(bolt &pbolt, int throw_2, bool teleport, int acc_bonus, else { message_current_target(); - direction( thr, DIR_NONE, TARG_ENEMY ); + direction( thr, DIR_NONE, TARG_HOSTILE); if (!thr.isValid) { @@ -3864,7 +3864,7 @@ void zap_wand(int slot) // Unless the character knows the type of the wand, the targetting // system will default to enemies. -- [ds] - targ_mode_type targ_mode = TARG_ENEMY; + targ_mode_type targ_mode = TARG_HOSTILE; beam.obvious_effect = false; @@ -3947,7 +3947,7 @@ void zap_wand(int slot) break; default: - targ_mode = TARG_ENEMY; + targ_mode = TARG_HOSTILE; break; } } |