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/files.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/files.cc')
| -rw-r--r-- | crawl-ref/source/files.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/crawl-ref/source/files.cc b/crawl-ref/source/files.cc index 472c2558cb..107a86b710 100644 --- a/crawl-ref/source/files.cc +++ b/crawl-ref/source/files.cc @@ -1396,7 +1396,9 @@ bool load( dungeon_feature_type stair_taken, load_mode_type load_mode, // Forget about interrupted butchering, since we probably aren't going // to get back to the corpse in time to finish things. - you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED] = 0; + // But do not reset the weapon swap if we swapped weapons + // because of a transformation. + maybe_clear_weapon_swap(); } return just_created_level; |