diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-04 14:47:09 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-04 14:47:09 +0000 |
| commit | ca98a8399e80e0fa440298a6ddf383d706343088 (patch) | |
| tree | efb9093515837fa9c2137965baf513cc447d308d /crawl-ref/source/delay.cc | |
| parent | 7326d539ae67aba12e9a49dd94b2fe419845c759 (diff) | |
| download | crawl-ref-ca98a8399e80e0fa440298a6ddf383d706343088.tar.gz crawl-ref-ca98a8399e80e0fa440298a6ddf383d706343088.zip | |
Disallow vampires from draining summoned creatures to be consistent with
summoned creatures being incapable of bleeding on the floor. This makes
things more difficult for Vampires; on the other hand there was a (more
or less) recent change that lets them regain 1 hp *per turn* when
draining corpses. We might also increase the duration of blood
potions...
Apart from that, various clean-ups.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6393 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/delay.cc')
| -rw-r--r-- | crawl-ref/source/delay.cc | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc index 7fef1d1f86..2e20c7406b 100644 --- a/crawl-ref/source/delay.cc +++ b/crawl-ref/source/delay.cc @@ -228,7 +228,7 @@ static std::string _get_recite_speech(const std::string key, int weight) if (!str.empty()) return (str); - // in case nothing is found + // In case nothing is found. if (key == "start") return ("begin reciting the Axioms of Law."); @@ -295,7 +295,6 @@ static void _clear_pending_delays() } void start_delay( delay_type type, int turns, int parm1, int parm2 ) -/***********************************************************/ { ASSERT(!crawl_state.is_repeating_cmd() || type == DELAY_MACRO); @@ -322,7 +321,6 @@ void start_delay( delay_type type, int turns, int parm1, int parm2 ) } void stop_delay( bool stop_stair_travel ) -/*********************/ { _interrupts_blocked = 0; // Just to be safe @@ -461,7 +459,7 @@ void stop_delay( bool stop_stair_travel ) break; case DELAY_INTERRUPTIBLE: - // always stoppable by definition... + // Always stoppable by definition... // try using a more specific type anyways. -- bwr _pop_delay(); break; @@ -596,10 +594,10 @@ bool is_vampire_feeding() return (delay.type == DELAY_FEED_VAMPIRE); } -// Check whether there are monsters who might be influenced by Recite -// returns 0, if no monsters found -// returns 1, if eligible audience found -// returns -1, if entire audience already affected or too dumb to understand. +// Check whether there are monsters who might be influenced by Recite. +// Returns 0, if no monsters found +// Returns 1, if eligible audience found +// Returns -1, if entire audience already affected or too dumb to understand. int check_recital_audience() { int mid; @@ -654,7 +652,6 @@ static void _xom_check_corpse_waste() } void handle_delay( void ) -/***********************/ { if (!you_are_delayed()) return; |