diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-09 18:18:52 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-09 18:18:52 +0000 |
| commit | 2ee0afe954a7c72856fd5f0f7d3080012638bb98 (patch) | |
| tree | e74d1ada80812f82ebcd67c8928b9c9a3f2a0a81 /crawl-ref/source/delay.cc | |
| parent | 2ef8bb80a61c7b8aec6264babac49b04de264e96 (diff) | |
| download | crawl-ref-2ee0afe954a7c72856fd5f0f7d3080012638bb98.tar.gz crawl-ref-2ee0afe954a7c72856fd5f0f7d3080012638bb98.zip | |
Remove pickup.lua.
Make menu_colour_item_prefix also apply for autopickup_exceptions, so
you can exclude, for example, all evil_eating at once.
Fix Vampires "continuing draining" after having "stopped".
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5666 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/delay.cc')
| -rw-r--r-- | crawl-ref/source/delay.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc index c78e73dce3..13bba97f25 100644 --- a/crawl-ref/source/delay.cc +++ b/crawl-ref/source/delay.cc @@ -492,6 +492,7 @@ void stop_delay( bool stop_stair_travel ) turn_corpse_into_skeleton(corpse, 90); } did_god_conduct(DID_DRINK_BLOOD, 8); + delay.duration = 0; pop_delay(); break; } @@ -746,7 +747,7 @@ void handle_delay( void ) { mpr("The corpse rots away into a skeleton!"); if (delay.type == DELAY_BUTCHER - || delay.type == DELAY_BOTTLE_BLOOD) + || delay.type == DELAY_BOTTLE_BLOOD) // Shouldn't happen. { if (player_mutation_level(MUT_SAPROVOROUS) == 3) xom_check_corpse_waste(); |