diff options
| author | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-12-16 01:29:20 +0000 |
|---|---|---|
| committer | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-12-16 01:29:20 +0000 |
| commit | 69f34130bc2442fd59b5870e2d864c4f72f0d2e2 (patch) | |
| tree | 67a07a5b44a97672885e185a7081675d17db6134 | |
| parent | ef52f15919757a08fe9309147ebe4a6ba28b8f2d (diff) | |
| download | crawl-ref-69f34130bc2442fd59b5870e2d864c4f72f0d2e2.tar.gz crawl-ref-69f34130bc2442fd59b5870e2d864c4f72f0d2e2.zip | |
Fix for bug 2430493: forget about interrupted butchering when doing
auto-explore or inter-level travel.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7840 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/travel.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/crawl-ref/source/travel.cc b/crawl-ref/source/travel.cc index ecef971888..bd330549c2 100644 --- a/crawl-ref/source/travel.cc +++ b/crawl-ref/source/travel.cc @@ -2557,6 +2557,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.pos.reset(); last_stair.depth = -1; @@ -2963,6 +2966,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) |