fiddlerwoaroof/crawl - Change 6QOJM3P5IONWA3LWLN7YT7KZKNSFNIGNRLL5ZIKFRQ42BDURNAEAC

Fix a net bug that was responsible for never (!) entrapping monsters. Whoops...

Also autoID a weapon of returning the player actually sees returning. (Bug 1830129)

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

Created by j-p-e-g on November 18, 2007

6QOJM3P5IONWA3LWLN7YT7KZKNSFNIGNRLL5ZIKFRQ42BDURNAEAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/mstuff2.cc at line 41 [4.1340842]
[4.1341800]
[4.1341800]
```
#include "randart.h"
```

Replacement in crawl-ref/source/mstuff2.cc at line 1427 [4.1340842]

B:BD[5.690] → [5.690:743]

                    << monster->name(DESC_NOCAP_THE)

[5.690]

[2.330]

                    << (player_monster_visible(monster)?
                        monster->name(DESC_NOCAP_THE) : "where it came from")

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

[2.371]

[5.791]

        
        // Player saw the item return
        if (!is_artefact(mitm[hand_used]))
            set_ident_flags(mitm[hand_used], ISFLAG_KNOW_TYPE);

Replacement in crawl-ref/source/mon-util.cc at line 4425 [4.1699344]
B:BD[6.13472] → [7.1468:1509]
```
        int net = get_trapping_net(x,y);
```
[6.13472]
[6.13777]
```
        int net = get_trapping_net(x,y,true);
```

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

B:BD[7.4148] → [3.576:659]

    return (you.attribute[ATTR_HELD]
            && item.base_type == OBJ_MISSILES

[7.4148]

[3.659]

    return (item.base_type == OBJ_MISSILES