fiddlerwoaroof/crawl - Change ZCSO4HPSQOVAOPCF3QBRAFHHS6QP65LVRZ4WE3E4IMCGGDTDIOOQC

Fix 2784872: Take off not working for wearing (with the option).

Also, add another item selector for worn armour for the takeoff prompt (and equip_unequip is false). I figured in the 'W'ear menu armour already worn takes up less space, and you're rather likely to directly switch to another piece of clothing.

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

Created by j-p-e-g on May 2, 2009

ZCSO4HPSQOVAOPCF3QBRAFHHS6QP65LVRZ4WE3E4IMCGGDTDIOOQC

Dependencies

In channels

main

Change contents

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

B:BD[3.2796991] → [4.5907:5980]

        slot = prompt_invent_item( mesg.c_str(), MT_INVLIST, OBJ_ARMOUR,

[3.2796991]

[5.2853]

        int selector = OBJ_ARMOUR;
        if (oper == OPER_TAKEOFF && !Options.equip_unequip)
            selector = OSEL_WORN_ARMOUR;
        slot = prompt_invent_item( mesg.c_str(), MT_INVLIST, selector,

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

B:BD[3.2805216] → [6.4088:4118]

    if (item_cursed(invitem))

[3.2805216]

[3.2805254]

    const equipment_type slot = get_armour_slot(invitem);
    if (!you_tran_can_wear(invitem) && invitem.link == you.equip[slot])

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

B:BD[3.2805260] → [7.4188:4245]

        for (int i = EQ_CLOAK; i <= EQ_BODY_ARMOUR; i++)

[3.2805260]

[3.2805329]

        mprf("%s is melded into your body!",
             invitem.name(DESC_CAP_YOUR).c_str());
        return (false);
    }
    if (!wearing_slot(item))
    {
        if (Options.equip_unequip)
            return do_wear_armour(item, true);
        else

Replacement in crawl-ref/source/item_use.cc at line 1178 [3.2781507]
B:BD[3.2805339] → [7.4246:4284]
∅:D[7.4284] → [3.2805381:2805395]
B:BD[3.2805381] → [3.2805381:2805395]
B:BD[3.2805395] → [8.21797:21847]
B:BD[8.21847] → [7.4285:4344]
∅:D[7.4344] → [9.32844:32876]
B:BD[8.21912] → [9.32844:32876]
∅:D[9.32876] → [3.2805561:2805575]
B:BD[3.2805561] → [3.2805561:2805575]
```
            if (item == you.equip[i])
            {
                mprf("%s is stuck to your body!",
                     invitem.name(DESC_CAP_YOUR).c_str());
                return (false);
            }
```
[3.2805339]
[3.2805575]
```
            mpr("You aren't wearing that object!");
            return (false);
```

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

B:BD[10.6547] → [10.6547:6677]

    const equipment_type slot = get_armour_slot(invitem);
    if (!you_tran_can_wear(invitem) && invitem.link == you.equip[slot])

[10.6547]

[10.6677]

    // If we get here, we're wearing the item.
    if (item_cursed(invitem))

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

B:BD[10.6683] → [10.6683:6779]

        mprf("%s is melded into your body!",
             invitem.name(DESC_CAP_YOUR).c_str());

[10.6683]

[10.6779]

        mprf("%s is stuck to your body!", invitem.name(DESC_CAP_YOUR).c_str());

Deletion in crawl-ref/source/item_use.cc at line 1213 [3.2781507]

B:BD[3.2806245] → [3.2806245:2806358]

B:BD[3.2806358] → [9.32910:32938]

        }
        if (item != you.equip[EQ_BODY_ARMOUR])
        {
            mpr("You aren't wearing that!");
            return (false);

Replacement in crawl-ref/source/invent.h at line 21 [3.2919073]

B:BD[11.91336] → [12.6609:6843]

B:BD[12.6843] → [13.2522:2548]

B:BD[13.2548] → [2.5827:5878]

    OSEL_ANY       =  -1,
    OSEL_WIELD     =  -2,
    OSEL_UNIDENT   =  -3,
    OSEL_EQUIP     =  -4,
    OSEL_MEMORISE  =  -5,
    OSEL_RECHARGE  =  -6,
    OSEL_ENCH_ARM  =  -7,
    OSEL_VAMP_EAT  =  -8,
    OSEL_DRAW_DECK =  -9,
    OSEL_THROWABLE = -10,
    OSEL_BUTCHERY  = -11,
    OSEL_EVOKABLE  = -12

[11.91336]

[11.91427]

    OSEL_ANY         =  -1,
    OSEL_WIELD       =  -2,
    OSEL_UNIDENT     =  -3,
    OSEL_EQUIP       =  -4,
    OSEL_MEMORISE    =  -5,
    OSEL_RECHARGE    =  -6,
    OSEL_ENCH_ARM    =  -7,
    OSEL_VAMP_EAT    =  -8,
    OSEL_DRAW_DECK   =  -9,
    OSEL_THROWABLE   = -10,
    OSEL_BUTCHERY    = -11,
    OSEL_EVOKABLE    = -12,
    OSEL_WORN_ARMOUR = -13

Insertion in crawl-ref/source/invent.cc at line 986 [3.2920632]

[10.7142]

[14.338]

    case OSEL_WORN_ARMOUR:
        return (itype == OBJ_ARMOUR && item_is_equipped(i));