fiddlerwoaroof/crawl - Change BMGB25AWEDOAWKDB7H22R6D4SL32CSBSOBWBIEN3GFGDLEDGEWJAC

Since mons_clear_trapping_net() checks if the monster is caught in a

net, a separate check before calling it is redundant, so remove instances of that.

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

Created by dolorous on June 19, 2008

BMGB25AWEDOAWKDB7H22R6D4SL32CSBSOBWBIEN3GFGDLEDGEWJAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/mstuff2.h at line 102 [5.1336995]
B:BD[4.1179] → [2.200:246]
```
void mons_clear_trapping_net(monsters *mons);
```
[4.1179]
[5.1340798]
```
void mons_clear_trapping_net(monsters *mon);
```

Replacement in crawl-ref/source/mstuff2.cc at line 999 [5.1340842]

B:BD[5.1363163] → [2.250:325]

    if (mons_is_caught(monster))
        mons_clear_trapping_net(monster);

[5.1363163]

[2.325]

    mons_clear_trapping_net(monster);

Replacement in crawl-ref/source/mstuff2.cc at line 2543 [5.1340842]
B:BD[2.328] → [2.328:373]
```
void mons_clear_trapping_net(monsters *mons)
```
[2.328]
[2.373]
```
void mons_clear_trapping_net(monsters *mon)
```
Replacement in crawl-ref/source/mstuff2.cc at line 2545 [5.1340842]
B:BD[2.375] → [2.375:406]
```
    if (!mons_is_caught(mons))
```
[2.375]
[2.406]
```
    if (!mons_is_caught(mon))
```

Replacement in crawl-ref/source/mstuff2.cc at line 2548 [5.1340842]

B:BD[2.423] → [2.423:479]

    const int net = get_trapping_net(mons->x, mons->y);

[2.423]

[2.479]

    const int net = get_trapping_net(mon->x, mon->y);

Replacement in crawl-ref/source/mstuff2.cc at line 2552 [5.1340842]
B:BD[2.548] → [2.548:585]
```
    mons->del_ench(ENCH_HELD, true);
```
[2.548]
[2.585]
```
    mon->del_ench(ENCH_HELD, true);
```
Replacement in crawl-ref/source/monstuff.cc at line 706 [5.1396662]
∅:D[6.2988] → [7.1428:1461]
B:BD[7.1428] → [7.1428:1461]
B:BD[7.1461] → [2.591:633]
```
    if (mons_is_caught(monster))
        mons_clear_trapping_net(monster);
```
[6.2988]
[2.633]
```
    mons_clear_trapping_net(monster);
```

Replacement in crawl-ref/source/monstuff.cc at line 1647 [5.1396662]

B:BD[5.1428841] → [2.635:710]

    if (mons_is_caught(monster))
        mons_clear_trapping_net(monster);

[5.1428841]

[7.2255]

    mons_clear_trapping_net(monster);

Replacement in crawl-ref/source/debug.cc at line 4107 [5.4016436]

B:BD[3.3586] → [3.3586:3696]

    struct monsters* mon1 = &menv[mid1];
    if (mons_is_caught(mon1))
        mons_clear_trapping_net(mon1);

[3.3586]

[3.3696]

    monsters* mon1 = &menv[mid1];
    mons_clear_trapping_net(mon1);

Replacement in crawl-ref/source/debug.cc at line 4110 [5.4016436]

B:BD[3.3697] → [3.3697:3785]

    int              mid2 = mgrd[moves.tx][moves.ty];
    struct monsters* mon2 = NULL;

[3.3697]

[3.3785]

    int mid2 = mgrd[moves.tx][moves.ty];
    monsters* mon2 = NULL;

Replacement in crawl-ref/source/debug.cc at line 4116 [5.4016436]

B:BD[3.3849] → [3.3849:3927]


        if (mons_is_caught(mon2))
            mons_clear_trapping_net(mon2);

[3.3849]

[3.3927]

        mons_clear_trapping_net(mon2);

Since mons_clear_trapping_net() checks if the monster is caught in a

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/mstuff2.h at line 102 [5.1336995]

Replacement in crawl-ref/source/mstuff2.cc at line 999 [5.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 2543 [5.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 2545 [5.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 2548 [5.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 2552 [5.1340842]

Replacement in crawl-ref/source/monstuff.cc at line 706 [5.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 1647 [5.1396662]

Replacement in crawl-ref/source/debug.cc at line 4107 [5.4016436]

Replacement in crawl-ref/source/debug.cc at line 4110 [5.4016436]

Replacement in crawl-ref/source/debug.cc at line 4116 [5.4016436]