summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/travel.cc
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source/travel.cc')
-rw-r--r--crawl-ref/source/travel.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/crawl-ref/source/travel.cc b/crawl-ref/source/travel.cc
index 0faca23a84..08083eeb90 100644
--- a/crawl-ref/source/travel.cc
+++ b/crawl-ref/source/travel.cc
@@ -2496,6 +2496,9 @@ void start_translevel_travel(bool prompt_for_destination)
if (level_target.p.id.depth > 0)
{
+ // Forget interrupted butchering.
+ you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED] = 0;
+
you.running = RMODE_INTERLEVEL;
you.running.x = you.running.y = 0;
last_stair.depth = -1;
@@ -2919,6 +2922,9 @@ void start_explore(bool grab_items)
if (!i_feel_safe(true, true))
return;
+ // Forget interrupted butchering.
+ you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED] = 0;
+
you.running = grab_items? RMODE_EXPLORE_GREEDY : RMODE_EXPLORE;
if (you.running == RMODE_EXPLORE_GREEDY
&& Options.stash_tracking != STM_ALL)