summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/item_use.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2007-08-20 23:33:00 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2007-08-20 23:33:00 +0000
commite87a10675f4aa5a08cc82e031385a74d26cb1732 (patch)
tree16d19149f80708f5c5e0c3d58f32c42f4d771203 /crawl-ref/source/item_use.cc
parent037b6326b7b553ff7610b9ef70207aee35d9defa (diff)
downloadcrawl-ref-e87a10675f4aa5a08cc82e031385a74d26cb1732.tar.gz
crawl-ref-e87a10675f4aa5a08cc82e031385a74d26cb1732.zip
A few small changes:
- self targetting for "bad" wands defaults to 'n' - switching weapons for dissection ignores wield_warning - nets do damage 0 (really) git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2022 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/item_use.cc')
-rw-r--r--crawl-ref/source/item_use.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index e306963512..bd614dbc85 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -271,7 +271,8 @@ bool wield_weapon(bool auto_wield, int slot, bool show_weff_messages)
mpr(you.inv[item_slot].name(DESC_INVENTORY_EQUIP).c_str());
// warn player about low str/dex or throwing skill
- wield_warning();
+ if (show_weff_messages)
+ wield_warning();
// time calculations
you.time_taken /= 2;
@@ -2051,7 +2052,8 @@ bool throw_it(bolt &pbolt, int throw_2, bool teleport, int acc_bonus,
// They don't do any damage!
baseDam = 0;
exDamBonus = 0;
-
+ ammoDamBonus = 0;
+
// but accuracy is important for this one
baseHit = 1;
exHitBonus += (skill_bump(SK_RANGED_COMBAT) * 7 / 2);