fiddlerwoaroof/crawl - Change GMCNF7YBSN7WQJNHSF3RV2NTHTVP4TABCNP7S26UEIHPAKNCPWGAC

Apply dolorous' patch to fix incorrect handling of nets monsters

leave behind when blinking or teleporting. (Thanks.)

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

Created by j-p-e-g on December 30, 2007

GMCNF7YBSN7WQJNHSF3RV2NTHTVP4TABCNP7S26UEIHPAKNCPWGAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/mstuff2.h at line 102 [4.1336995]
[3.1179]
[4.1340798]
```
void mons_clear_trapping_net(monsters *mons);
```
Insertion in crawl-ref/source/mstuff2.cc at line 943 [4.1340842]
[5.3864]
[4.1363087]

Insertion in crawl-ref/source/mstuff2.cc at line 947 [4.1340842]

[4.1363163]

[4.1363213]

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

Deletion in crawl-ref/source/mstuff2.cc at line 994 [4.1340842]
B:BD[5.3976] → [5.3976:3977]
B:BD[5.3977] → [6.719:801]
```
    if (monster->has_ench(ENCH_HELD))
        monster->del_ench(ENCH_HELD, true);
```

Insertion in crawl-ref/source/mstuff2.cc at line 2405 [4.1340842]

[3.3038]


void mons_clear_trapping_net(monsters *mons)
{
    if (!mons_is_caught(mons))
        return;
    const int net = get_trapping_net(mons->x, mons->y);
    if (net != NON_ITEM)
        remove_item_stationary(mitm[net]);
    mons->del_ench(ENCH_HELD, true);
}

Replacement in crawl-ref/source/monstuff.cc at line 481 [4.1396662]

B:BD[7.1461] → [7.1461:1608]

    {
        int net = get_trapping_net(monster->x,monster->y);
        if (net != NON_ITEM)
            remove_item_stationary(mitm[net]);
    }

[7.1461]

[2.3390]

        mons_clear_trapping_net(monster);

Replacement in crawl-ref/source/monstuff.cc at line 1346 [4.1396662]

B:BD[4.1428841] → [7.2173:2255]

    if (monster->has_ench(ENCH_HELD))
        monster->del_ench(ENCH_HELD, true);

[4.1428841]

[7.2255]

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