diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-02-02 19:57:43 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-02-02 19:57:43 +0000 |
| commit | 73e93cb36fd23c84328abe78555a35009a57d2e7 (patch) | |
| tree | 1545802d84da3401728b0bb55adc7dc16bde5dd7 /crawl-ref/source/delay.cc | |
| parent | 37a4ac33578a9a8e9366ce1e0686dbea42dc66b8 (diff) | |
| download | crawl-ref-73e93cb36fd23c84328abe78555a35009a57d2e7.tar.gz crawl-ref-73e93cb36fd23c84328abe78555a35009a57d2e7.zip | |
Make being caught in a net interrupt the stair delay, and disallow beholding
attempts (mermaid) while the player is taking some stairs.
Also add a message for wielding a weapon of distortion. (I'm afraid there
already used to be one that I've accidentally removed.)
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3385 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, 12 insertions, 3 deletions
diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc index e08e74998a..6877e9b598 100644 --- a/crawl-ref/source/delay.cc +++ b/crawl-ref/source/delay.cc @@ -236,7 +236,7 @@ void start_delay( delay_type type, int turns, int parm1, int parm2 ) push_delay( delay ); } -void stop_delay( void ) +void stop_delay( bool stop_stair_travel ) /*********************/ { if ( you.delay_queue.empty() ) @@ -355,10 +355,19 @@ void stop_delay( void ) // and would have to have a prompt... this works just fine. -- bwr break; - case DELAY_WEAPON_SWAP: // one turn... too much trouble - case DELAY_DROP_ITEM: // one turn... only used for easy armour drops case DELAY_ASCENDING_STAIRS: // short... and probably what people want case DELAY_DESCENDING_STAIRS: // short... and probably what people want + if (stop_stair_travel) + { +#ifdef DEBUG_DIAGNOSTICS + mpr("Stop ascending/descending stairs."); +#endif + pop_delay(); + } + break; + + case DELAY_WEAPON_SWAP: // one turn... too much trouble + case DELAY_DROP_ITEM: // one turn... only used for easy armour drops case DELAY_UNINTERRUPTIBLE: // never stoppable case DELAY_JEWELLERY_ON: // one turn default: |