From 3e026503b17f1aa9367a88d0d6fdc9aab7e8aa51 Mon Sep 17 00:00:00 2001 From: zelgadis Date: Sat, 31 May 2008 03:19:15 +0000 Subject: 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 --- crawl-ref/source/it_use2.cc | 2 ++ 1 file changed, 2 insertions(+) (limited to 'crawl-ref/source/it_use2.cc') 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() -- cgit v1.2.3-54-g00ecf