fiddlerwoaroof/crawl - Change TK2BJDNDUF2XVLLLSGFXTK3ESZOQ6GGJC3UXENOCMEQXC4AE6T6AC

Fix 1942290

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

Created by pauldubois on April 15, 2008

TK2BJDNDUF2XVLLLSGFXTK3ESZOQ6GGJC3UXENOCMEQXC4AE6T6AC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/quiver.h at line 27 [3.2527]
B:BD[3.3131] → [3.3131:3151]
```
    AMMO_INVALID=-1
```

Replacement in crawl-ref/source/quiver.cc at line 52 [3.3828]

B:BD[3.5103] → [2.4787:4879]

∅:D[2.4879] → [3.5103:5145]

B:BD[3.5103] → [3.5103:5145]

    ASSERT(m_last_used_type != AMMO_INVALID);
    // I'd like to get rid of this first case
    if (m_last_used_type == AMMO_INVALID)

[3.5103]

[3.5145]

    const int slot = _get_pack_slot(m_last_used_of_type[m_last_used_type]);
    if (slot == -1)

Replacement in crawl-ref/source/quiver.cc at line 55 [3.3828]

B:BD[3.5151] → [4.3744:3822]

        if (item_out) *item_out = NULL;
        if (slot_out) *slot_out = -1;

[3.5151]

[3.5201]

        // Not in inv, but caller can at least get the type of the item.
        if (item_out) *item_out = &m_last_used_of_type[m_last_used_type];

Replacement in crawl-ref/source/quiver.cc at line 60 [3.3828]

B:BD[3.5222] → [4.3823:3927]

∅:D[4.3927] → [3.5326:5413]

B:BD[3.5326] → [3.5326:5413]

B:BD[3.5413] → [4.3928:4006]

∅:D[4.4006] → [3.5477:5586]

B:BD[3.5477] → [3.5477:5586]

B:BD[3.5586] → [4.4007:4061]

∅:D[4.4061] → [3.5631:5641]

B:BD[3.5631] → [3.5631:5641]

B:BD[3.5641] → [4.4062:4102]

        const int slot = _get_pack_slot(m_last_used_of_type[m_last_used_type]);
        if (slot == -1)
        {
            // Not in inv, but caller can at least get the type of the item.
            if (item_out) *item_out = &m_last_used_of_type[m_last_used_type];
        }
        else
        {
            // Return the item in inv, since it will have an accurate count
            if (item_out) *item_out = &you.inv[slot];
        }
        if (slot_out) *slot_out = slot;

[3.5222]

[3.5641]

        // Return the item in inv, since it will have an accurate count
        if (item_out) *item_out = &you.inv[slot];

Insertion in crawl-ref/source/quiver.cc at line 63 [3.3828]
[3.5647]
[3.5647]
```
    if (slot_out) *slot_out = slot;
```

Replacement in crawl-ref/source/quiver.cc at line 317 [3.3828]

B:BD[2.5892] → [2.5892:5969]

    ASSERT(m_last_used_type >= AMMO_INVALID && m_last_used_type < NUM_AMMO);

[2.5892]

[2.5969]

    ASSERT(m_last_used_type >= AMMO_THROW && m_last_used_type < NUM_AMMO);

Replacement in crawl-ref/source/quiver.cc at line 338 [3.3828]

B:BD[2.6599] → [2.6599:6670]

        you.m_quiver->get_desired_item(NULL, &m_last_used_of_type[i]);

[2.6599]

[2.6670]

        m_last_used_of_type[i] =
            _get_pack_slot(you.m_quiver->m_last_used_of_type[i]);