diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-05 08:39:20 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-05 08:39:20 +0000 |
| commit | 3423bbab5a0f024eeafffe6b8260c8c088647db1 (patch) | |
| tree | 7ac6d73449b874aba363c80d57a097833bcf7613 /crawl-ref/source/delay.h | |
| parent | 166e51b5cc6e35ec1bea7dd24e9e6ae549ac3dde (diff) | |
| download | crawl-ref-3423bbab5a0f024eeafffe6b8260c8c088647db1.tar.gz crawl-ref-3423bbab5a0f024eeafffe6b8260c8c088647db1.zip | |
First attempt at making vampire feeding interruptible. It doesn't work
yet (I had "You stop feeding" followed by "You continue feeding"
including full effects), but it's probably better to commit now anyway.
Known potions of blood or porridge cannot be quaffed when
engorged (alive).
Also clean up blood potions check.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4871 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/delay.h')
| -rw-r--r-- | crawl-ref/source/delay.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/crawl-ref/source/delay.h b/crawl-ref/source/delay.h index 7c00e1bd5f..44df52435c 100644 --- a/crawl-ref/source/delay.h +++ b/crawl-ref/source/delay.h @@ -1,7 +1,7 @@ /* * File: delay.h * Summary: Functions for handling multi-turn actions. - * + * * Modified for Crawl Reference by $Author$ on $Date$ * * Change History (most recent first): @@ -44,7 +44,7 @@ struct activity_interrupt_data : apt(AIP_STRING), data(s), context() { } - activity_interrupt_data(const std::string &s) + activity_interrupt_data(const std::string &s) : apt(AIP_STRING), data(s.c_str()), context() { } @@ -72,13 +72,14 @@ struct ait_hp_loss void start_delay( delay_type type, int turns, int parm1 = 0, int parm2 = 0 ); void stop_delay( bool stop_stair_travel = false ); -bool you_are_delayed( void ); -delay_type current_delay_action( void ); +bool you_are_delayed( void ); +delay_type current_delay_action( void ); int check_recital_audience( void ); void handle_delay( void ); bool is_run_delay(int delay); bool is_being_butchered(const item_def &item); +bool is_vampire_feeding( void ); void stop_butcher_delay(); const char *activity_interrupt_name(activity_interrupt_type ai); @@ -88,8 +89,8 @@ const char *delay_name(int delay); delay_type get_delay(const std::string &); void perform_activity(); -bool interrupt_activity( activity_interrupt_type ai, - const activity_interrupt_data &a +bool interrupt_activity( activity_interrupt_type ai, + const activity_interrupt_data &a = activity_interrupt_data() ); #endif |