fiddlerwoaroof/crawl - Change LSAVA5BJQO4Z2MYXVQOM4AOXTCLKDNQMOS3DZ4SDNO4LI422LA3AC

Fix 1941744: lava snake "bursts forth from the water"

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4230 c06c8d41-db1a-0410-9941-cceddc491573

Created by j-p-e-g on April 14, 2008

LSAVA5BJQO4Z2MYXVQOM4AOXTCLKDNQMOS3DZ4SDNO4LI422LA3AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/delay.cc at line 277 [4.3963459]
∅:D[3.995007] → [4.3964205:3964210]
B:BD[4.3964205] → [4.3964205:3964210]
```
    
```
[3.995007]
[4.3964210]
Replacement in crawl-ref/source/delay.cc at line 511 [4.3963459]
B:BD[5.7559] → [2.5327:5355]
```
      if (!found_monsters) 
```
[5.7559]
[2.5355]
```
      if (!found_monsters)
```

Replacement in crawl-ref/source/delay.cc at line 603 [4.3963459]

B:BD[3.997742] → [3.997742:997811]

        // However, it would not be at the player's square like the

[3.997742]

[6.19243]

        // However, it would not be at the player's square like the

Replacement in crawl-ref/source/delay.cc at line 659 [4.3963459]
B:BD[3.998851] → [3.998851:998896]
```
        while (!items_for_multidrop.empty() 
```
[3.998851]
[3.998896]
```
        while (!items_for_multidrop.empty()
```
Replacement in crawl-ref/source/delay.cc at line 673 [4.3963459]
B:BD[3.999307] → [5.7942:7980]
```
    if ( delay.type == DELAY_RECITE) 
```
[3.999307]
[5.7980]
```
    if ( delay.type == DELAY_RECITE)
```
Replacement in crawl-ref/source/delay.cc at line 675 [4.3963459]
B:BD[5.7986] → [5.7986:7998]
```
           
```
[5.7986]
[2.5676]
Replacement in crawl-ref/source/delay.cc at line 685 [4.3963459]
B:BD[5.8357] → [5.8357:8362]
```
    
```
[5.8357]
[3.999307]

Replacement in crawl-ref/source/delay.cc at line 690 [4.3963459]

B:BD[4.3969228] → [7.20944:21082]

        mprf(MSGCH_DIAGNOSTICS, "Delay type: %d (%s), duration: %d", 
             delay.type, delay_name(delay.type), delay.duration );

[4.3969228]

[4.3969399]

        mprf(MSGCH_DIAGNOSTICS, "Delay type: %d (%s), duration: %d",
             delay.type, delay_name(delay.type), delay.duration );

Replacement in crawl-ref/source/delay.cc at line 699 [4.3963459]
B:BD[8.1704] → [8.1704:1713]
```
        
```
[8.1704]
[3.999551]
Replacement in crawl-ref/source/delay.cc at line 742 [4.3963459]
B:BD[3.1000821] → [3.1000821:1000831]
```
    else 
```
[3.1000821]
[3.1000831]
```
    else
```
Replacement in crawl-ref/source/delay.cc at line 769 [4.3963459]
B:BD[3.1001520] → [9.4204:4241]
```
        const equipment_type slot = 
```
[3.1001520]
[9.4241]
```
        const equipment_type slot =
```
Replacement in crawl-ref/source/delay.cc at line 823 [4.3963459]
B:BD[9.5627] → [9.5627:5643]
```
        break; 
```
[9.5627]
[4.3969797]
```
        break;
```
Replacement in crawl-ref/source/delay.cc at line 828 [4.3963459]
∅:D[10.53275] → [9.5754:5770]
B:BD[9.5754] → [9.5754:5770]
B:BD[9.5770] → [5.8592:8601]
```
        break; 
        
```
[10.53275]
[5.8601]
```
        break;
```

Replacement in crawl-ref/source/delay.cc at line 864 [4.3963459]

B:BD[9.6879] → [9.6879:6927]

                if (!shift_monster(&menv[mon])

[9.6879]

[9.6927]

                if (!shift_monster(&menv[mon])

Replacement in crawl-ref/source/delay.cc at line 874 [4.3963459]
B:BD[9.7186] → [9.7186:7202]
```
        break; 
```
[9.7186]
[9.7202]
```
        break;
```

Replacement in crawl-ref/source/delay.cc at line 942 [4.3963459]

B:BD[9.7710] → [9.7710:7773]

        // Note:  checking if item is droppable is assumed to

[9.7710]

[9.7773]

        // Note:  checking if item is droppable is assumed to

Replacement in crawl-ref/source/delay.cc at line 950 [4.3963459]

B:BD[3.1006780] → [9.7976:8039]

        // Must handle unwield_item before we attempt to copy

[3.1006780]

[9.8039]

        // Must handle unwield_item before we attempt to copy

Replacement in crawl-ref/source/delay.cc at line 953 [4.3963459]
B:BD[9.8153] → [9.8153:8166]
```
        {   
```
[9.8153]
[11.1960]
```
        {
```

Replacement in crawl-ref/source/delay.cc at line 958 [4.3963459]

B:BD[3.1006893] → [9.8301:8358]

        if (!copy_item_to_grid( you.inv[ delay.parm1 ],

[3.1006893]

[9.8358]

        if (!copy_item_to_grid( you.inv[ delay.parm1 ],

Replacement in crawl-ref/source/delay.cc at line 987 [4.3963459]
B:BD[9.9288] → [9.9288:9304]
```
        break; 
```
[9.9288]
[3.1007430]
```
        break;
```
Replacement in crawl-ref/source/delay.cc at line 1050 [4.3963459]
B:BD[3.1008858] → [3.1008858:1008867]
```
    {   
```
[3.1008858]
[3.1008867]
```
    {
```
Replacement in crawl-ref/source/delay.cc at line 1094 [4.3963459]
B:BD[3.1010029] → [3.1010029:1010061]
```
            // you.speed += 2; 
```
[3.1010029]
[3.1010061]
```
            // you.speed += 2;
```

Replacement in crawl-ref/source/delay.cc at line 1399 [4.3963459]

∅:D[12.4898] → [13.1909:1966]

B:BD[13.1909] → [13.1909:1966]

                text += " bursts forth from the water.";

[12.4898]

[14.1768]

            {
                text += " bursts forth from the ";
                if (mons_habitat(mon) == HT_LAVA)
                    text += "lava";
                else if (mons_habitat(mon) == HT_WATER)
                    text += "water";
                else
                    text += "realm of bugdom";
                text += ".";
            }

Insertion in crawl-ref/source/delay.cc at line 1413 [4.3963459]
[14.1863]
[14.1863]
```
            {
```
Insertion in crawl-ref/source/delay.cc at line 1416 [4.3963459]
[14.1962]
[14.1962]
```
            }
```
Replacement in crawl-ref/source/delay.cc at line 1476 [4.3963459]
B:BD[15.6169] → [15.6169:6223]
```
bool interrupt_activity( activity_interrupt_type ai, 
```
[15.6169]
[3.1015371]
```
bool interrupt_activity( activity_interrupt_type ai,
```
Replacement in crawl-ref/source/delay.cc at line 1485 [4.3963459]
B:BD[3.1015480] → [16.1282:1287]
```
    
```
[3.1015480]
[3.1015480]
Replacement in crawl-ref/source/delay.cc at line 1493 [4.3963459]
B:BD[17.1250] → [17.1250:1255]
```
    
```
[17.1250]
[3.1015533]
Replacement in crawl-ref/source/delay.cc at line 1549 [4.3963459]
B:BD[3.1017077] → [3.1017077:1017123]
```
    ASSERT( sizeof(activity_interrupt_names) 
```
[3.1017077]
[3.1017123]
```
    ASSERT( sizeof(activity_interrupt_names)
```

Fix 1941744: lava snake "bursts forth from the water"

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/delay.cc at line 277 [4.3963459]

Replacement in crawl-ref/source/delay.cc at line 511 [4.3963459]

Replacement in crawl-ref/source/delay.cc at line 603 [4.3963459]

Replacement in crawl-ref/source/delay.cc at line 659 [4.3963459]

Replacement in crawl-ref/source/delay.cc at line 673 [4.3963459]

Replacement in crawl-ref/source/delay.cc at line 675 [4.3963459]

Replacement in crawl-ref/source/delay.cc at line 685 [4.3963459]

Replacement in crawl-ref/source/delay.cc at line 690 [4.3963459]

Replacement in crawl-ref/source/delay.cc at line 699 [4.3963459]

Replacement in crawl-ref/source/delay.cc at line 742 [4.3963459]

Replacement in crawl-ref/source/delay.cc at line 769 [4.3963459]

Replacement in crawl-ref/source/delay.cc at line 823 [4.3963459]

Replacement in crawl-ref/source/delay.cc at line 828 [4.3963459]

Replacement in crawl-ref/source/delay.cc at line 864 [4.3963459]

Replacement in crawl-ref/source/delay.cc at line 874 [4.3963459]

Replacement in crawl-ref/source/delay.cc at line 942 [4.3963459]

Replacement in crawl-ref/source/delay.cc at line 950 [4.3963459]

Replacement in crawl-ref/source/delay.cc at line 953 [4.3963459]

Replacement in crawl-ref/source/delay.cc at line 958 [4.3963459]

Replacement in crawl-ref/source/delay.cc at line 987 [4.3963459]

Replacement in crawl-ref/source/delay.cc at line 1050 [4.3963459]

Replacement in crawl-ref/source/delay.cc at line 1094 [4.3963459]

Replacement in crawl-ref/source/delay.cc at line 1399 [4.3963459]

Insertion in crawl-ref/source/delay.cc at line 1413 [4.3963459]

Insertion in crawl-ref/source/delay.cc at line 1416 [4.3963459]

Replacement in crawl-ref/source/delay.cc at line 1476 [4.3963459]

Replacement in crawl-ref/source/delay.cc at line 1485 [4.3963459]

Replacement in crawl-ref/source/delay.cc at line 1493 [4.3963459]

Replacement in crawl-ref/source/delay.cc at line 1549 [4.3963459]