diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-04-11 20:03:20 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-04-11 20:03:20 +0000 |
| commit | e80122a2ce9321aaa14f1c80321525fb580182dd (patch) | |
| tree | b6e9fc250f364719ad25bdbedbff70a3443b64a7 /crawl-ref/source/travel.cc | |
| parent | 294794073634d4aa598858ba8f577b95f606356d (diff) | |
| download | crawl-ref-e80122a2ce9321aaa14f1c80321525fb580182dd.tar.gz crawl-ref-e80122a2ce9321aaa14f1c80321525fb580182dd.zip | |
* Fix 2744875 (mutation screen assert).
* Rename KeymapContext KC_* -> KMC_* to avoid overlap with
kill_category KC_*.
* Increase odds for chaos brands mimicking brands that hurt the defender.
* Tweak chaos_affects_attacker().
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9595 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/travel.cc')
| -rw-r--r-- | crawl-ref/source/travel.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/travel.cc b/crawl-ref/source/travel.cc index 8e14c27a8a..7636330f22 100644 --- a/crawl-ref/source/travel.cc +++ b/crawl-ref/source/travel.cc @@ -2562,7 +2562,7 @@ 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; + maybe_clear_weapon_swap(); you.running = RMODE_INTERLEVEL; you.running.pos.reset(); @@ -2977,7 +2977,7 @@ void start_explore(bool grab_items) return; // Forget interrupted butchering. - you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED] = 0; + maybe_clear_weapon_swap(); you.running = (grab_items? RMODE_EXPLORE_GREEDY : RMODE_EXPLORE); if (you.running == RMODE_EXPLORE_GREEDY |