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/transform.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/transform.cc')
| -rw-r--r-- | crawl-ref/source/transform.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/crawl-ref/source/transform.cc b/crawl-ref/source/transform.cc index 6846b5019e..06727d5a99 100644 --- a/crawl-ref/source/transform.cc +++ b/crawl-ref/source/transform.cc @@ -128,10 +128,12 @@ bool form_likes_lava(transformation_type form) && !form_changed_physiology(form); } -bool form_can_butcher_barehanded(transformation_type form) +bool form_can_butcher(transformation_type form) { - return form == TRAN_BLADE_HANDS || form == TRAN_DRAGON - || form == TRAN_ICE_BEAST; + return form != TRAN_BAT + && form != TRAN_WISP + && form != TRAN_JELLY + && form != TRAN_FUNGUS; } // Used to mark transformations which override species intrinsics. @@ -1375,9 +1377,6 @@ void untransform(bool skip_wielding, bool skip_move) init_player_doll(); #endif - if (form_can_butcher_barehanded(old_form)) - stop_butcher_delay(); - // If nagas wear boots while transformed, they fall off again afterwards: // I don't believe this is currently possible, and if it is we // probably need something better to cover all possibilities. -bwr @@ -1429,7 +1428,7 @@ void untransform(bool skip_wielding, bool skip_move) } if (!skip_wielding) - handle_interrupted_swap(true, false); + handle_interrupted_swap(); you.turn_is_over = true; if (you.transform_uncancellable) |