fiddlerwoaroof/crawl - Change UP6TD25TZ3ENYTOB6N6NA325ROEJPDCW5VPNBRTAFMC7HLFXU4CQC

Clearing trapping nets moved into player::moveto() and level change.

This fixes some bugs (e.g. Portal spell and nets interact properly.)

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

Created by haranp on February 12, 2009

UP6TD25TZ3ENYTOB6N6NA325ROEJPDCW5VPNBRTAFMC7HLFXU4CQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/traps.h at line 34 [5.3043]
B:BD[5.4330] → [5.4330:4363]
B:BD[5.4363] → [6.132:163]
```
void player_caught_in_net(void);
void clear_trapping_net(void);
```
[5.4330]
[7.136]
```
void player_caught_in_net();
void clear_trapping_net();
```
Insertion in crawl-ref/source/traps.cc at line 1067 [5.5308]
[6.379]
[8.6440]
```
    if (!in_bounds(you.pos()))
        return;
```
Deletion in crawl-ref/source/spells4.cc at line 2423 [10.436250]
B:BD[9.5698] → [4.273:300]
```
    clear_trapping_net();
```
Deletion in crawl-ref/source/spells3.cc at line 1326 [10.531613]
B:BD[10.550600] → [6.440:477]
B:BD[6.477] → [11.23963:23997]
∅:D[12.218] → [6.535:573]
∅:D[11.23997] → [6.535:573]
B:BD[6.535] → [6.535:573]
B:BD[6.573] → [13.310:311]
```
            // no longer held in net
            if (pos != you.pos())
                clear_trapping_net();
```
Deletion in crawl-ref/source/spells3.cc at line 1388 [10.531613]
∅:D[14.1292] → [15.167:168]
∅:D[11.24602] → [15.167:168]
B:BD[16.475] → [15.167:168]
∅:D[15.168] → [6.591:624]
B:BD[6.591] → [6.591:624]
B:BD[6.624] → [11.24603:24636]
∅:D[12.271] → [6.676:710]
∅:D[11.24636] → [6.676:710]
B:BD[6.676] → [6.676:710]
```
        // no longer held in net
        if (newpos != you.pos())
            clear_trapping_net();
```
Deletion in crawl-ref/source/spells3.cc at line 1398 [10.531613]
∅:D[13.475] → [17.7159:7160]
∅:D[16.770] → [17.7159:7160]
B:BD[10.551688] → [17.7159:7160]
B:BD[17.7160] → [11.24711:24742]
```
        you.position = newpos;
```
Replacement in crawl-ref/source/spells3.cc at line 1399 [10.531613]
∅:D[16.824] → [17.7160:7239]
B:BD[17.7160] → [17.7160:7239]
B:BD[17.7239] → [13.476:477]
```
        // Necessary to update the view centre.
        you.moveto(you.pos());
```
[16.824]
[10.551688]
```
        you.moveto(newpos);
```
Deletion in crawl-ref/source/spells1.cc at line 179 [10.616635]
B:BD[10.619202] → [18.277:315]
∅:D[18.315] → [6.752:786]
B:BD[6.752] → [6.752:786]
B:BD[6.786] → [19.1070:1071]
```
            // No longer held in net.
            clear_trapping_net();
```
Deletion in crawl-ref/source/spells1.cc at line 232 [10.616635]
B:BD[20.172] → [21.248:282]
∅:D[21.282] → [6.833:863]
B:BD[6.833] → [6.833:863]
∅:D[6.863] → [22.717:718]
B:BD[22.717] → [22.717:718]
```
        // No longer held in net.
        clear_trapping_net();
```
Insertion in crawl-ref/source/player.cc at line 7251 [10.962854]
[3.3036]
[3.3036]
```
    if (c != you.pos())
        clear_trapping_net();
```
Replacement in crawl-ref/source/player.cc at line 7266 [10.962854]
B:BD[23.2499] → [8.18893:18925]
```
    prev_move = coord_def(0,0);
```
[23.2499]
[23.2541]
```
    prev_move.reset();
```

Insertion in crawl-ref/source/misc.cc at line 1725 [10.1933596]

[24.2905]

[10.1945194]


    // Magical level changes (don't exist yet in this direction)
    // need this.
    clear_trapping_net();

Insertion in crawl-ref/source/misc.cc at line 2103 [10.1933596]

[25.9987]


    // Magical level changes (Portal, Banishment) need this.
    clear_trapping_net();

Deletion in crawl-ref/source/item_use.cc at line 1901 [10.2781507]
B:BD[2.10679] → [2.10679:10709]
```
        clear_trapping_net();
```
Deletion in crawl-ref/source/effects.cc at line 551 [10.3382105]
B:BD[6.1020] → [26.7362:7392]
∅:D[26.7392] → [6.1049:1075]
B:BD[6.1049] → [6.1049:1075]
∅:D[6.1075] → [27.2634:2635]
B:BD[27.2634] → [27.2634:2635]
```
    // No longer held in net.
    clear_trapping_net();
```
Deletion in crawl-ref/source/debug.cc at line 5584 [10.4016436]
B:BD[28.3155] → [28.3155:3211]
```
    // no longer held in net
    clear_trapping_net();
```

Clearing trapping nets moved into player::moveto() and level change.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/traps.h at line 34 [5.3043]

Insertion in crawl-ref/source/traps.cc at line 1067 [5.5308]

Deletion in crawl-ref/source/spells4.cc at line 2423 [10.436250]

Deletion in crawl-ref/source/spells3.cc at line 1326 [10.531613]

Deletion in crawl-ref/source/spells3.cc at line 1388 [10.531613]

Deletion in crawl-ref/source/spells3.cc at line 1398 [10.531613]

Replacement in crawl-ref/source/spells3.cc at line 1399 [10.531613]

Deletion in crawl-ref/source/spells1.cc at line 179 [10.616635]

Deletion in crawl-ref/source/spells1.cc at line 232 [10.616635]

Insertion in crawl-ref/source/player.cc at line 7251 [10.962854]

Replacement in crawl-ref/source/player.cc at line 7266 [10.962854]

Insertion in crawl-ref/source/misc.cc at line 1725 [10.1933596]

Insertion in crawl-ref/source/misc.cc at line 2103 [10.1933596]

Deletion in crawl-ref/source/item_use.cc at line 1901 [10.2781507]

Deletion in crawl-ref/source/effects.cc at line 551 [10.3382105]

Deletion in crawl-ref/source/debug.cc at line 5584 [10.4016436]