fiddlerwoaroof/crawl - Change ZNOLV6MQ475T5IXWQRGTYTWHIFAD5ELNWX63M6ZVBNUXOMTSG5NQC

[1817715] Fixed autopickup trying to pick up nets you're caught in.

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

Created by dshaligram on October 29, 2007

ZNOLV6MQ475T5IXWQRGTYTWHIFAD5ELNWX63M6ZVBNUXOMTSG5NQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/items.cc at line 1441 [4.2584728]

B:BD[4.2614080] → [5.2225:2297]

B:BD[5.2297] → [3.1825:1916]

    if (you.attribute[ATTR_HELD] && mitm[obj].base_type == OBJ_MISSILES
        && mitm[obj].sub_type == MI_THROWING_NET
        && item_is_stationary(mitm[obj]))

[4.2614080]

[6.24024]

    if (item_is_stationary(mitm[obj]))

Insertion in crawl-ref/source/items.cc at line 2929 [4.2584728]
[4.2657387]
[7.945]
```
    if (item_is_stationary(item))
        return (false);
    
```

Replacement in crawl-ref/source/itemprop.cc at line 482 [9.646661]

B:BD[8.3969] → [2.2928:2948]

    item.plus2 = 1;

[8.3969]

[8.4006]

    if (item.base_type == OBJ_MISSILES && item.sub_type == MI_THROWING_NET)
        item.plus2 = 1;

Replacement in crawl-ref/source/itemprop.cc at line 488 [9.646661]

B:BD[8.4057] → [2.2949:2969]

    item.plus2 = 0;

[8.4057]

[9.666102]

    if (item.base_type == OBJ_MISSILES && item.sub_type == MI_THROWING_NET)
        item.plus2 = 0;

Replacement in crawl-ref/source/itemprop.cc at line 494 [9.646661]

B:BD[8.4148] → [2.2970:2995]

    return (item.plus2);

[8.4148]

[8.4193]

    return (you.attribute[ATTR_HELD]
            && item.base_type == OBJ_MISSILES
            && item.sub_type == MI_THROWING_NET
            && item.plus2);