fiddlerwoaroof/crawl - Change YL3SLEMOESF2QDGYWH5ATHN46PODT57GQUKYHWDAV4HFC5AR6OHQC

' will now swap to miscellaneous items (except for runes) but not

missiles. [1847482]

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

Created by haranp on December 10, 2007

YL3SLEMOESF2QDGYWH5ATHN46PODT57GQUKYHWDAV4HFC5AR6OHQC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/item_use.cc at line 182 [3.2781507]
B:BD[3.2783744] → [3.2783744:2783767]
B:BD[3.2783803] → [3.2783803:2783804]
```
    int item_slot = 0;
```
Insertion in crawl-ref/source/item_use.cc at line 198 [3.2781507]
[3.2784571]
[3.2784571]
```
    int item_slot = 0;          // default is 'a'
```

Replacement in crawl-ref/source/item_use.cc at line 203 [3.2781507]

B:BD[3.2784598] → [3.2784598:2784736]

B:BD[3.2784736] → [4.364528:364570]

        if (you.equip[EQ_WEAPON] == 0)  // ie. weapon is currently 'a'
            item_slot = 1;
        else
            item_slot = 0;
        if (slot != -1) item_slot = slot;

[3.2784598]

[3.2784736]

        if ( item_slot == you.equip[EQ_WEAPON] )
            item_slot = 1;      // backup is 'b'
        if (slot != -1)         // allow external override
            item_slot = slot;

Replacement in crawl-ref/source/item_use.cc at line 210 [3.2781507]

B:BD[3.2784743] → [4.364571:364790]

    bool force_unwield = 
                you.inv[item_slot].base_type != OBJ_WEAPONS
                   && you.inv[item_slot].base_type != OBJ_MISSILES
                   && you.inv[item_slot].base_type != OBJ_STAVES;

[3.2784743]

[4.364790]

    // If the swap slot has a bad (but valid) item in it,
    // the swap will be to bare hands.
    const bool good_swap = 
        you.inv[item_slot].base_type == OBJ_WEAPONS
        || you.inv[item_slot].base_type == OBJ_STAVES
        || (you.inv[item_slot].base_type == OBJ_MISCELLANY
            && you.inv[item_slot].sub_type != MISC_RUNE_OF_ZOT);

Replacement in crawl-ref/source/item_use.cc at line 223 [3.2781507]

∅:D[2.351] → [4.364792:364868]

B:BD[3.2784831] → [4.364792:364868]

    if (!auto_wield || !is_valid_item(you.inv[item_slot]) || force_unwield)

[2.351]

[3.2784892]

    if (!auto_wield || !is_valid_item(you.inv[item_slot]) || !good_swap)