fiddlerwoaroof/crawl - Change BBQWA33DPXWEDYOOPO45VAYD4JQDZQVMZSEJ4RUI5LLC733IMIIQC

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

Created by j-p-e-g on February 2, 2008

BBQWA33DPXWEDYOOPO45VAYD4JQDZQVMZSEJ4RUI5LLC733IMIIQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/traps.cc at line 20 [4.5308]
[3.866]
[4.5709]
```
#include "delay.h"
```
Insertion in crawl-ref/source/traps.cc at line 175 [4.5308]
[4.9373]
[4.9373]
```
        
        stop_delay(true); // even stair delays
```

Insertion in crawl-ref/source/monstuff.cc at line 2892 [5.1396662]

[2.4030]

        // Don't behold player already half down or up the stairs
        if ( !you.delay_queue.empty() && you.delay_queue.front().type )
        {
#ifdef DEBUG_DIAGNOSTICS
            mpr("Taking stairs, don't behold.", MSGCH_DIAGNOSTICS);
#endif
            break;
        }

Insertion in crawl-ref/source/item_use.cc at line 620 [5.2781507]

[5.2794771]

[6.14739]

                mpr("Space warps around you for a moment!");

Replacement in crawl-ref/source/delay.h at line 74 [5.3962990]
B:BD[7.1373] → [7.1373:1398]
```
void stop_delay( void );
```
[7.1373]
[5.3963323]
```
void stop_delay( bool stop_stair_travel = false );
```
Replacement in crawl-ref/source/delay.cc at line 239 [5.3963459]
B:BD[5.3964351] → [5.3964351:3964375]
```
void stop_delay( void )
```
[5.3964351]
[5.3964375]
```
void stop_delay( bool stop_stair_travel )
```

Deletion in crawl-ref/source/delay.cc at line 358 [5.3963459]

B:BD[5.3967073] → [5.3967073:3967221]

    case DELAY_WEAPON_SWAP:       // one turn... too much trouble 
    case DELAY_DROP_ITEM:         // one turn... only used for easy armour drops

Insertion in crawl-ref/source/delay.cc at line 360 [5.3963459]

[5.3967373]

[8.996772]

         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

Make being caught in a net interrupt the stair delay, and disallow beholding

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/traps.cc at line 20 [4.5308]

Insertion in crawl-ref/source/traps.cc at line 175 [4.5308]

Insertion in crawl-ref/source/monstuff.cc at line 2892 [5.1396662]

Insertion in crawl-ref/source/item_use.cc at line 620 [5.2781507]

Replacement in crawl-ref/source/delay.h at line 74 [5.3962990]

Replacement in crawl-ref/source/delay.cc at line 239 [5.3963459]

Deletion in crawl-ref/source/delay.cc at line 358 [5.3963459]

Insertion in crawl-ref/source/delay.cc at line 360 [5.3963459]