diff options
author | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-12-02 07:59:12 +0000 |
---|---|---|
committer | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-12-02 07:59:12 +0000 |
commit | 07eadf8e4cf3dd61fa66d194720143685ab84174 (patch) | |
tree | 60ca13a09c47d9c6a7b0d871bac374f057134e85 /crawl-ref/source/delay.h | |
parent | d03bcac5636625a61db20500a51418227316b34b (diff) | |
download | crawl-ref-07eadf8e4cf3dd61fa66d194720143685ab84174.tar.gz crawl-ref-07eadf8e4cf3dd61fa66d194720143685ab84174.zip |
Merge r7717 and r7718: improvements to interrupted butchery behaviour.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@7719 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/delay.h')
-rw-r--r-- | crawl-ref/source/delay.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crawl-ref/source/delay.h b/crawl-ref/source/delay.h index bffb1b8a8c..42545629bd 100644 --- a/crawl-ref/source/delay.h +++ b/crawl-ref/source/delay.h @@ -81,6 +81,8 @@ bool is_run_delay(int delay); bool is_being_butchered(const item_def &item, bool just_first = true); bool is_vampire_feeding( void ); void stop_butcher_delay(); +void handle_interrupted_swap(bool swap_if_safe = false, + bool force_unsafe = false); const char *activity_interrupt_name(activity_interrupt_type ai); activity_interrupt_type get_activity_interrupt(const std::string &); |