diff options
author | Chris Campbell <chriscampbell89@gmail.com> | 2013-12-06 05:57:04 +0000 |
---|---|---|
committer | Chris Campbell <chriscampbell89@gmail.com> | 2013-12-06 06:53:11 +0000 |
commit | dd49da7c5fad146f00cc7c967af74863d9269137 (patch) | |
tree | 311e4741708ef3d667ed66b07305e6e1bd12acbe /crawl-ref/source/files.cc | |
parent | 1575af7ce31d0e5874dea515af15871de07e394b (diff) | |
download | crawl-ref-dd49da7c5fad146f00cc7c967af74863d9269137.tar.gz crawl-ref-dd49da7c5fad146f00cc7c967af74863d9269137.zip |
Simplify butchery handling
Butchery is always allowed except in a few forms (bat, wisp, fungus).
Removes a lot of unnecessary/unused code for swapping weapons and removing
equipment when butchering.
Diffstat (limited to 'crawl-ref/source/files.cc')
-rw-r--r-- | crawl-ref/source/files.cc | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/crawl-ref/source/files.cc b/crawl-ref/source/files.cc index 227b7b4e36..b2ddfd6481 100644 --- a/crawl-ref/source/files.cc +++ b/crawl-ref/source/files.cc @@ -1563,17 +1563,6 @@ bool load_level(dungeon_feature_type stair_taken, load_mode_type load_mode, } } - // If butchering was interrupted by switching levels (banishment) - // then switch back from butchering tool if there's no hostiles - // nearby. - handle_interrupted_swap(true); - - // Forget about interrupted butchering, since we probably aren't going - // to get back to the corpse in time to finish things. - // But do not reset the weapon swap if we swapped weapons - // because of a transformation. - maybe_clear_weapon_swap(); - ash_detect_portals(is_map_persistent()); } // Initialize halos, etc. |