summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/acr.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/acr.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/acr.cc')
-rw-r--r--crawl-ref/source/acr.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index 0d8d9afdee..3ffbe4947f 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -1492,7 +1492,8 @@ static void _input()
if (you_are_delayed())
{
- _world_reacts();
+ if (you.time_taken)
+ _world_reacts();
return;
}