fiddlerwoaroof/crawl - Change B2RS2OEOA42BFPUGRT7T2NTLQ57F2WYPHT235EDQ556RIBV6CSDAC

Stack identified and unidentified ammo when picking it up. (mesilliac)

If you have a stack of +0 stones, identical stones will auto-id.

Created by Adam Borowski on October 6, 2009

B2RS2OEOA42BFPUGRT7T2NTLQ57F2WYPHT235EDQ556RIBV6CSDAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/items.h at line 45 [5.2580284]

B:BD[3.774] → [4.3419:3487]

bool items_similar( const item_def &item1, const item_def &item2 );

[3.774]

[6.20157]

bool items_similar( const item_def &item1, const item_def &item2,
                    bool ignore_ident = false );

Replacement in crawl-ref/source/items.h at line 48 [5.2580284]

B:BD[6.20221] → [4.3488:3534]

                  bool force_merge = false );

[6.20221]

[2.5246]

                  bool force_merge = false, bool ignore_ident = false );

Replacement in crawl-ref/source/items.cc at line 1307 [5.2584728]

B:BD[5.2612145] → [4.3536:3601]

bool items_similar(const item_def &item1, const item_def &item2)

[5.2612145]

[5.2612210]

bool items_similar(const item_def &item1, const item_def &item2, bool ignore_ident)

Replacement in crawl-ref/source/items.cc at line 1330 [5.2584728]
∅:D[7.26717] → [8.343:393]
B:BD[9.154] → [8.343:393]
```
    if (ident_flags(item1) != ident_flags(item2))
```
[7.26717]
[7.26718]
```
    if (!ignore_ident && ident_flags(item1) != ident_flags(item2))
```

Replacement in crawl-ref/source/items.cc at line 1367 [5.2584728]

B:BD[4.3875] → [4.3875:3912]

                  bool force_merge )

[4.3875]

[4.3912]

                  bool force_merge, bool ignore_ident )

Replacement in crawl-ref/source/items.cc at line 1376 [5.2584728]
B:BD[4.4082] → [4.4082:4122]
```
    return items_similar(item1, item2);
```
[4.4082]
[2.5345]
```
    return items_similar(item1, item2, ignore_ident);
```

Replacement in crawl-ref/source/items.cc at line 1545 [5.2584728]

B:BD[5.2615324] → [5.2615324:2615378]

            if (items_stack( you.inv[m], mitm[obj] ))

[5.2615324]

[5.2615378]

            if (items_stack( you.inv[m], mitm[obj], false, true ))

Insertion in crawl-ref/source/items.cc at line 1578 [5.2584728]

[10.3408]

                }
                // If only one of the stacks is identified,
                // identify the other to a similar extent.
                if (ident_flags(mitm[obj]) != ident_flags(you.inv[m]))
                {
                    if (!quiet)
                        mpr("These items seem quite similar!");
                    mitm[obj].flags |=
                        ident_flags(you.inv[m]) & you.inv[m].flags;
                    you.inv[m].flags |=
                        ident_flags(mitm[obj]) & mitm[obj].flags;