From 1179295c512c18b6be28732d10d64f607b7a40e3 Mon Sep 17 00:00:00 2001 From: haranp Date: Wed, 27 Jun 2007 09:05:49 +0000 Subject: 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 --- crawl-ref/source/item_use.cc | 7 +++++-- 1 file 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; -- cgit v1.2.3-54-g00ecf