summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/item_use.cc
diff options
context:
space:
mode:
authorharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2008-10-11 15:50:46 +0000
committerharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2008-10-11 15:50:46 +0000
commit6f8e75f0aaf3f8f4c038bc4765a60dcf48fe57ca (patch)
tree4bc32a2e87d8f7d7648a1059710a3cff82d1e4fe /crawl-ref/source/item_use.cc
parent670cdde1fae7896c45aeaed440dcfd2d19470f3e (diff)
downloadcrawl-ref-6f8e75f0aaf3f8f4c038bc4765a60dcf48fe57ca.tar.gz
crawl-ref-6f8e75f0aaf3f8f4c038bc4765a60dcf48fe57ca.zip
Fix 2041934: auto-swapping rings and amulets was taking twice as long
as manually swapping (two double-speed turns plus one bogus normal-speed turn.) This also applied to weapon swapping after butchery. This fix is rather hackish, better solutions appreciated. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7213 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/item_use.cc')
-rw-r--r--crawl-ref/source/item_use.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index 7ed6249e18..8d64311eb0 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -309,6 +309,7 @@ bool wield_weapon(bool auto_wield, int slot, bool show_weff_messages)
canned_msg(MSG_EMPTY_HANDED);
+ // Switching to bare hands is extra fast.
you.turn_is_over = true;
you.time_taken *= 3;
you.time_taken /= 10;
@@ -3158,7 +3159,7 @@ bool puton_item(int item_slot, bool prompt_finger)
jewellery_wear_effects( you.inv[item_slot] );
// Putting on jewellery is as fast as wielding weapons.
- you.time_taken = you.time_taken * 5 / 10;
+ you.time_taken /= 2;
you.turn_is_over = true;
return (true);