fiddlerwoaroof/crawl - Change EPA5CK2JX4C7FXYCCA2VX3JPLUEYQYYQJYVA37AFNFBIL7JAAGAAC

Force quiver to attempt to use the exact same item in inventory (slot

and all, if it still exists) before accepting any item that happens to have the same properties (base + subtype, plusses etc.)

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

Created by j-p-e-g on June 29, 2008

EPA5CK2JX4C7FXYCCA2VX3JPLUEYQYYQJYVA37AFNFBIL7JAAGAAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/quiver.cc at line 28 [5.3828]

∅:D[3.2652] → [4.3677:3743]

B:BD[4.3677] → [4.3677:3743]

static bool _items_similar(const item_def& a, const item_def& b);

[3.2652]

[3.2653]

static bool _items_similar(const item_def& a, const item_def& b,
                           bool force = true);

Insertion in crawl-ref/source/quiver.cc at line 274 [5.3828]
[4.5605]
[4.5605]
```
            // Weapon type changed.
```

Replacement in crawl-ref/source/quiver.cc at line 333 [5.3828]

B:BD[3.3518] → [3.3518:3577]

    mpr("recalculating fire order...", MSGCH_DIAGNOSTICS);

[3.3518]

[3.3577]

    mpr("Recalculating fire order...", MSGCH_DIAGNOSTICS);

Insertion in crawl-ref/source/quiver.cc at line 564 [5.3828]
[5.11519]
[6.10984]
```
    // First try to find the exact same item.
```

Replacement in crawl-ref/source/quiver.cc at line 568 [5.3828]

B:BD[4.8329] → [4.8329:8396]

        if (inv_item.quantity && _items_similar(item, you.inv[i]))

[4.8329]

[5.11604]

        if (inv_item.quantity && _items_similar(item, you.inv[i], false))
            return i;
    }
    // If that fails, try to find an item sufficiently similar.
    for (int i = 0; i < ENDOFPACK; i++)
    {
        const item_def& inv_item = you.inv[i];
        if (inv_item.quantity && _items_similar(item, you.inv[i], true))

Replacement in crawl-ref/source/quiver.cc at line 610 [5.3828]

B:BD[4.8816] → [4.8816:8881]

static bool _items_similar(const item_def& a, const item_def& b)

[4.8816]

[4.8881]

static bool _items_similar(const item_def& a, const item_def& b, bool force)

Insertion in crawl-ref/source/quiver.cc at line 612 [5.3828]

[4.8883]

[7.4303]

    if (!force)
        return (items_similar(a, b) && a.slot == b.slot);

Replacement in crawl-ref/source/quiver.cc at line 616 [5.3828]
∅:D[7.4355] → [4.8934:8970]
B:BD[4.8934] → [4.8934:8970]
```
    return items_stack(a, b, true);
```
[7.4355]
[5.12434]
```
    return items_stack(a, b, force);
```
Insertion in crawl-ref/source/items.h at line 45 [10.2580284]
[8.774]
[9.20157]
```
bool items_similar( const item_def &item1, const item_def &item2 );
```

Replacement in crawl-ref/source/items.h at line 47 [10.2580284]

B:BD[9.20221] → [9.20221:20261]

                  bool force = false );

[9.20221]

[11.144271]

                  bool force_merge = false );

Replacement in crawl-ref/source/items.cc at line 1300 [10.2584728]

B:BD[10.2612145] → [9.20263:20364]

bool items_stack( const item_def &item1, const item_def &item2,
                  bool force_merge )

[10.2612145]

[10.2612210]

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

Replacement in crawl-ref/source/items.cc at line 1302 [10.2584728]
B:BD[10.2612212] → [10.2612212:2612248]
B:BD[10.2612248] → [9.20365:20459]
B:BD[9.20459] → [12.10453:10459]
∅:D[12.10459] → [10.2612316:2612340]
∅:D[9.20459] → [10.2612316:2612340]
B:BD[10.2612316] → [10.2612316:2612340]
B:BD[10.2612340] → [12.10460:10466]
∅:D[12.10466] → [10.2612340:2612400]
B:BD[10.2612340] → [10.2612340:2612400]
```
    // both items must be stackable
    if (!force_merge
        && (!is_stackable_item( item1 ) || !is_stackable_item( item2 )))
    {
        return (false);
    }
    // base and sub-types must always be the same to stack
```
[10.2612212]
[10.2612400]
```
    // Base and sub-types must always be the same to stack.
```
Deletion in crawl-ref/source/items.cc at line 1305 [10.2584728]
B:BD[10.2612504] → [10.2612504:2612505]
B:BD[10.2612505] → [9.20460:20519]
```
    ASSERT(force_merge || item1.base_type != OBJ_WEAPONS);
```
Replacement in crawl-ref/source/items.cc at line 1309 [10.2584728]
∅:D[8.924] → [10.2612505:2612558]
B:BD[10.2612505] → [10.2612505:2612558]
```
    // These classes also require pluses and special
```
[8.924]
[9.20521]
```
    // These classes also require pluses and special.
```

Replacement in crawl-ref/source/items.cc at line 1315 [10.2584728]

B:BD[10.2612703] → [10.2612703:2612794]

             || item1.plus2 != item2.plus2
             || item1.special != item2.special)

[10.2612703]

[10.2612794]

            || item1.plus2 != item2.plus2
            || item1.special != item2.special)

Insertion in crawl-ref/source/items.cc at line 1357 [10.2584728]

[10.2613908]

[13.352338]

}
bool items_stack( const item_def &item1, const item_def &item2,
                  bool force_merge )
{
    // Both items must be stackable.
    if (!force_merge
        && (!is_stackable_item( item1 ) || !is_stackable_item( item2 )))
    {
        return (false);
    }
    return items_similar(item1, item2);

Deletion in crawl-ref/source/item_use.cc at line 1279 [10.2781507]

B:BD[10.2810213] → [2.3324:3421]

#ifdef DEBUG_QUIVER
        mprf(MSGCH_DIAGNOSTICS, "i: %d, slot: %d", i, fire_order[i]);
#endif

Deletion in crawl-ref/source/item_use.cc at line 1283 [10.2781507]

B:BD[2.3495] → [2.3495:3670]

#ifdef DEBUG_QUIVER
            mprf(MSGCH_DIAGNOSTICS, "i: %d (%d), next: %d (%d), size: %d",
                 i, current, next, fire_order[next], fire_order.size());
#endif

Force quiver to attempt to use the exact same item in inventory (slot

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/quiver.cc at line 28 [5.3828]

Insertion in crawl-ref/source/quiver.cc at line 274 [5.3828]

Replacement in crawl-ref/source/quiver.cc at line 333 [5.3828]

Insertion in crawl-ref/source/quiver.cc at line 564 [5.3828]

Replacement in crawl-ref/source/quiver.cc at line 568 [5.3828]

Replacement in crawl-ref/source/quiver.cc at line 610 [5.3828]

Insertion in crawl-ref/source/quiver.cc at line 612 [5.3828]

Replacement in crawl-ref/source/quiver.cc at line 616 [5.3828]

Insertion in crawl-ref/source/items.h at line 45 [10.2580284]

Replacement in crawl-ref/source/items.h at line 47 [10.2580284]

Replacement in crawl-ref/source/items.cc at line 1300 [10.2584728]

Replacement in crawl-ref/source/items.cc at line 1302 [10.2584728]

Deletion in crawl-ref/source/items.cc at line 1305 [10.2584728]

Replacement in crawl-ref/source/items.cc at line 1309 [10.2584728]

Replacement in crawl-ref/source/items.cc at line 1315 [10.2584728]

Insertion in crawl-ref/source/items.cc at line 1357 [10.2584728]

Deletion in crawl-ref/source/item_use.cc at line 1279 [10.2781507]

Deletion in crawl-ref/source/item_use.cc at line 1283 [10.2781507]