diff options
| author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-06-27 09:05:49 +0000 |
|---|---|---|
| committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-06-27 09:05:49 +0000 |
| commit | 1179295c512c18b6be28732d10d64f607b7a40e3 (patch) | |
| tree | 4525ca95ad07401bf056437ac4e1826de20068a4 /crawl-ref/source/item_use.cc | |
| parent | 40fa9db0730383e3fa018999dc8e64208b2d12f5 (diff) | |
| download | crawl-ref-1179295c512c18b6be28732d10d64f607b7a40e3.tar.gz crawl-ref-1179295c512c18b6be28732d10d64f607b7a40e3.zip | |
Weapon-swap (') now respects !w (1744049).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1665 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, 5 insertions, 2 deletions
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index 1b88f4a50d..100077b5d4 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -250,6 +250,10 @@ bool wield_weapon(bool auto_wield, int slot, bool show_weff_messages) if (!can_wield(&you.inv[item_slot], true)) return (false); + // check inscriptions + if ( !check_warning_inscriptions(you.inv[item_slot], OPER_WIELD) ) + return false; + // Go ahead and wield the weapon. if (you.equip[EQ_WEAPON] != -1) unwield_item(you.equip[EQ_WEAPON], show_weff_messages); @@ -265,8 +269,7 @@ bool wield_weapon(bool auto_wield, int slot, bool show_weff_messages) wield_warning(); // time calculations - you.time_taken *= 5; - you.time_taken /= 10; + you.time_taken /= 2; you.wield_change = true; you.turn_is_over = true; |