summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/it_use2.cc
diff options
context:
space:
mode:
authorzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2008-05-31 03:19:15 +0000
committerzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2008-05-31 03:19:15 +0000
commit3e026503b17f1aa9367a88d0d6fdc9aab7e8aa51 (patch)
treef02349f8597977f706b87d3c001d73cac3279160 /crawl-ref/source/it_use2.cc
parent6de62154a08ad2e5da61694823aaff9ec033ed26 (diff)
downloadcrawl-ref-3e026503b17f1aa9367a88d0d6fdc9aab7e8aa51.tar.gz
crawl-ref-3e026503b17f1aa9367a88d0d6fdc9aab7e8aa51.zip
If butchering with a swapped weapon is interrupted, then switch back
to the non-butchering weapon as soon as the player is safe again. Enabled by setting option "swap_when_safe" to true. Also, fixed a bug where "not switching back" message wasn't always being given when butchering was interrupted. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5354 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/it_use2.cc')
-rw-r--r--crawl-ref/source/it_use2.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/crawl-ref/source/it_use2.cc b/crawl-ref/source/it_use2.cc
index 8299c21c34..575815ff27 100644
--- a/crawl-ref/source/it_use2.cc
+++ b/crawl-ref/source/it_use2.cc
@@ -523,6 +523,8 @@ bool unwield_item(bool showMsgs)
mpr("You feel your mana capacity decrease.");
}
+ you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED] = 0;
+
return (true);
} // end unwield_item()