fiddlerwoaroof/crawl - Change X343NDQNM6NY4KNVC45IV6BYY5XQR4RLSNJBMCFDSHFG73ZVYS3AC

Force update of the quiver by picking up throwable items. This might

hamper performance and is still not optimal: Wielding a sling, running out of stones, firing darts instead and then picking up some new stones won't make the quiver switch away from the darts because you "explicitly" fired them.

Also, can someone please tell me whether "(" or ")" are supposed to loop to the correct next item? I haven't been able to work that out from the quiver behaviour alone - it's not all that consistent, unfortunately.

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

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

X343NDQNM6NY4KNVC45IV6BYY5XQR4RLSNJBMCFDSHFG73ZVYS3AC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/quiver.cc at line 142 [4.3828]

[4.7559]

        const launch_retval projected = is_launched(&you, you.weapon(),
                                                    item);
        // Don't do anything if this item is not really fit for throwing.
        if (projected == LRET_FUMBLED)
            return;

Insertion in crawl-ref/source/quiver.cc at line 192 [4.3828]

[5.5832]

    const launch_retval projected = is_launched(&you, you.weapon(),
                                                you.inv[slot]);
    // Don't do anything if this item is not throwable.
    if (projected == LRET_FUMBLED)
        return;

Deletion in crawl-ref/source/quiver.cc at line 205 [4.3828]

B:BD[5.6039] → [3.2646:2751]

∅:D[3.2751] → [5.6141:6200]

B:BD[5.6141] → [5.6141:6200]

    else if (m_last_used_of_type[m_last_used_type].base_type
                != you.inv[slot].base_type)
    {
        // Not our current stack; don't bother
    }

Replacement in crawl-ref/source/quiver.cc at line 207 [4.3828]

B:BD[5.6215] → [5.6215:6270]

B:BD[5.6270] → [3.2752:2859]

        // Maybe matches current stack.  Redraw if so.
//        const item_def* desired;
//        int qv_slot;
//        get_desired_item(&desired, &qv_slot);

[5.6215]

[3.2859]

        // We might need to update the quiver...

Replacement in crawl-ref/source/quiver.cc at line 244 [4.3828]

B:BD[6.3742] → [6.3742:3802]

        (slot == AMMO_THROW ? LRET_THROWN : LRET_LAUNCHED);

[6.3742]

[3.2985]

         (weapon && is_range_weapon(*weapon)) ? LRET_LAUNCHED : LRET_THROWN;
//    const launch_retval desired_ret =
//        (slot == AMMO_THROW ? LRET_THROWN : LRET_LAUNCHED);

Replacement in crawl-ref/source/command.cc at line 675 [7.4082507]

B:BD[7.4094826] → [5.11676:11766]

    const item_def* item;
    int slot;
    you.m_quiver->get_desired_item(&item, &slot);

[7.4094826]

[7.4094870]

    std::string error_reason;
    int slot = you.m_quiver->get_fire_item(&error_reason);

Replacement in crawl-ref/source/command.cc at line 679 [7.4082507]
B:BD[8.9967] → [5.11767:11812]
```
    if (slot == -1 && !is_valid_item(*item))
```
[8.9967]
[5.11812]
```
    if (slot == -1)
```

Replacement in crawl-ref/source/command.cc at line 681 [7.4082507]

∅:D[5.11818] → [9.26454:26488]

B:BD[7.4094898] → [9.26454:26488]

B:BD[9.26488] → [5.11819:11856]

B:BD[5.11856] → [2.2737:2809]

∅:D[2.2809] → [5.11933:11964]

B:BD[5.11933] → [5.11933:11964]

        wstring += "    nothing";
    }
    else if (slot == -1)
    {
        wstring += "  - ";
        wstring += item->name(DESC_NOCAP_A);
        wstring += " (empty)";

[5.11818]

[5.11964]

        const item_def* item;
        you.m_quiver->get_desired_item(&item, &slot);
        if (!is_valid_item(*item))
        {
            wstring += "    nothing";
        }
        else
        {
            wstring += "  - ";
            wstring += item->name(DESC_NOCAP_A);
            wstring += " (empty)";
        }