diff options
| author | Haran Pilpel <haranp@users.sourceforge.net> | 2010-01-15 11:08:31 +0200 |
|---|---|---|
| committer | Haran Pilpel <haranp@users.sourceforge.net> | 2010-01-15 11:08:31 +0200 |
| commit | 03588849963bb625e961f4f256ed5f4fa0ed6cb3 (patch) | |
| tree | c4372d8a4f2619f87a0a4d8ce1ff68372610641c /crawl-ref/source/item_use.cc | |
| parent | 317d05294c07c9ccca0f3682c39269cb8f8de938 (diff) | |
| download | crawl-ref-03588849963bb625e961f4f256ed5f4fa0ed6cb3.tar.gz crawl-ref-03588849963bb625e961f4f256ed5f4fa0ed6cb3.zip | |
Merge Firing and Aim lines, per dcss:messagespam.
Diffstat (limited to 'crawl-ref/source/item_use.cc')
| -rw-r--r-- | crawl-ref/source/item_use.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index b161502515..ac4953d619 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -1390,10 +1390,8 @@ static bool _fire_choose_item_and_target(int& slot, dist& target, beh.message_ammo_prompt(); - // XXX: This stuff should be done by direction()! - message_current_target(); - direction( target, DIR_NONE, TARG_HOSTILE, -1, false, !teleport, true, false, - NULL, &beh ); + direction(target, DIR_NONE, TARG_HOSTILE, -1, false, !teleport, true, false, + NULL, &beh); if (beh.m_slot == -1) { @@ -2496,7 +2494,6 @@ bool throw_it(bolt &pbolt, int throw_2, bool teleport, int acc_bonus, thr = *target; else { - message_current_target(); direction(thr, DIR_NONE, TARG_HOSTILE); if (!thr.isValid) @@ -4383,7 +4380,6 @@ void zap_wand(int slot) int tracer_range = (alreadyknown && wand.sub_type != WAND_RANDOM_EFFECTS) ? _wand_range(type_zapped) : _max_wand_range(); - message_current_target(); direction(zap_wand, DIR_NONE, targ_mode, tracer_range); if (!zap_wand.isValid) |