summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/delay.h
diff options
context:
space:
mode:
authorChris Campbell <chriscampbell89@gmail.com>2013-12-06 05:57:04 +0000
committerChris Campbell <chriscampbell89@gmail.com>2013-12-06 06:53:11 +0000
commitdd49da7c5fad146f00cc7c967af74863d9269137 (patch)
tree311e4741708ef3d667ed66b07305e6e1bd12acbe /crawl-ref/source/delay.h
parent1575af7ce31d0e5874dea515af15871de07e394b (diff)
downloadcrawl-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/delay.h')
-rw-r--r--crawl-ref/source/delay.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/crawl-ref/source/delay.h b/crawl-ref/source/delay.h
index 25dd20a3b2..d1eb9e87c3 100644
--- a/crawl-ref/source/delay.h
+++ b/crawl-ref/source/delay.h
@@ -79,10 +79,7 @@ bool is_vampire_feeding();
bool is_butchering();
bool player_stair_delay();
bool already_learning_spell(int spell);
-void stop_butcher_delay();
-void maybe_clear_weapon_swap();
-void handle_interrupted_swap(bool swap_if_safe = false,
- bool force_unsafe = false);
+void handle_interrupted_swap();
void clear_macro_process_key_delay();