fiddlerwoaroof/crawl - Change XCPNY2Q3F3ELK3L2FRCXHVLANQ7JLB47VBIFIUME5I2PCXNRA3ZAC

Fix 2041934: auto-swapping rings and amulets was taking twice as long

as manually swapping (two double-speed turns plus one bogus normal-speed turn.) This also applied to weapon swapping after butchery. This fix is rather hackish, better solutions appreciated.

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

Created by haranp on October 11, 2008

XCPNY2Q3F3ELK3L2FRCXHVLANQ7JLB47VBIFIUME5I2PCXNRA3ZAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/item_use.cc at line 312 [5.2781507]
[3.1145]
[4.4950]
```
            // Switching to bare hands is extra fast.
```
Replacement in crawl-ref/source/item_use.cc at line 3162 [5.2781507]
B:BD[6.756449] → [6.756449:756495]
```
    you.time_taken = you.time_taken * 5 / 10;
```
[6.756449]
[6.756495]
```
    you.time_taken /= 2;
```
Replacement in crawl-ref/source/food.cc at line 134 [5.3043806]
B:BD[7.4207] → [7.4207:4247]
```
        if (you.equip[EQ_WEAPON] == -1)
```
[7.4207]
[7.4247]
```
        if (!you.weapon())
```
Replacement in crawl-ref/source/food.cc at line 159 [5.3043806]
B:BD[5.3047696] → [5.3047696:3047732]
```
    if (you.equip[EQ_WEAPON] != -1)
```
[5.3047696]
[3.1912]
```
    if (you.weapon())
```

Insertion in crawl-ref/source/food.cc at line 170 [5.3043806]

[8.2924]

[9.8594]


    // Same amount of time as normal wielding.
    // FIXME: this duplicated code is begging for a bug.
    if (you.weapon())
    {
        you.time_taken /= 2;
    }
    else                        // swapping to empty hands is faster
    {
        you.time_taken *= 3;
        you.time_taken /= 10;
    }

Replacement in crawl-ref/source/food.cc at line 189 [5.3043806]

B:BD[10.569] → [2.2866:2923]

static int _find_butchering_implement(int &butcher_tool)

[10.569]

[11.14346]

static bool _find_butchering_implement(int &butcher_tool)

Replacement in crawl-ref/source/fight.cc at line 60 [5.3140790]

B:BD[5.3142908] → [5.3142908:3143067]

#define HIT_WEAK 7
#define HIT_MED 18
#define HIT_STRONG 36
// ... was 5, 12, 21
// how these are used will be replaced by a function in a second ... :P {dlb}

[5.3142908]

[5.3143188]

const int HIT_WEAK   = 7;
const int HIT_MED    = 18;
const int HIT_STRONG = 36;

Insertion in crawl-ref/source/delay.cc at line 875 [5.3963459]

[12.6979]

[6.1000242]

            break;
        case DELAY_JEWELLERY_ON:
        case DELAY_WEAPON_SWAP:
            // These are 1-turn delays where the time cost is handled
            // in _finish_delay().
            // FIXME: get rid of this hack!
            you.time_taken = 0;

Insertion in crawl-ref/source/delay.cc at line 884 [5.3963459]
[6.1000261]
[6.1000261]
Replacement in crawl-ref/source/delay.cc at line 938 [5.3963459]
B:BD[13.3788] → [13.3788:3826]
```
        weapon_switch( delay.parm1 );
```
[13.3788]
[13.3826]
```
        weapon_switch(delay.parm1);
```
Replacement in crawl-ref/source/delay.cc at line 942 [5.3963459]
B:BD[13.3871] → [13.3871:3913]
```
        puton_ring( delay.parm1, false );
```
[13.3871]
[13.3913]
```
        puton_ring(delay.parm1, false);
```
Replacement in crawl-ref/source/delay.cc at line 946 [5.3963459]
B:BD[13.3955] → [14.24727:24772]
```
        _armour_wear_effects( delay.parm1 );
```
[13.3955]
[13.3999]
```
        _armour_wear_effects(delay.parm1);
```

Replacement in crawl-ref/source/delay.cc at line 954 [5.3963459]

B:BD[6.1001520] → [15.3011:3047]

∅:D[15.3047] → [13.4241:4294]

B:BD[13.4241] → [13.4241:4294]

        const equipment_type slot =
            get_armour_slot( you.inv[delay.parm1] );

[6.1001520]

[6.1001873]

        const equipment_type slot = get_armour_slot(you.inv[delay.parm1]);

Deletion in crawl-ref/source/delay.cc at line 965 [5.3963459]

B:BD[13.4486] → [13.4486:4613]

∅:D[13.4613] → [6.1002042:1002043]

B:BD[6.1002042] → [6.1002042:1002043]

                if (delay.parm1 == you.equip[EQ_SHIELD])
                    you.equip[EQ_SHIELD] = -1;
                break;

Deletion in crawl-ref/source/delay.cc at line 966 [5.3963459]

B:BD[13.4641] → [13.4641:4766]

∅:D[13.4766] → [6.1002214:1002215]

B:BD[6.1002214] → [6.1002214:1002215]

                if (delay.parm1 == you.equip[EQ_CLOAK])
                    you.equip[EQ_CLOAK] = -1;
                break;

Deletion in crawl-ref/source/delay.cc at line 967 [5.3963459]

B:BD[13.4795] → [13.4795:4922]

∅:D[13.4922] → [6.1002215:1002216]

B:BD[6.1002215] → [6.1002215:1002216]

                if (delay.parm1 == you.equip[EQ_HELMET])
                    you.equip[EQ_HELMET] = -1;
                break;

Deletion in crawl-ref/source/delay.cc at line 968 [5.3963459]

B:BD[13.4951] → [13.4951:5078]

∅:D[13.5078] → [6.1002387:1002388]

B:BD[6.1002387] → [6.1002387:1002388]

                if (delay.parm1 == you.equip[EQ_GLOVES])
                    you.equip[EQ_GLOVES] = -1;
                break;

Replacement in crawl-ref/source/delay.cc at line 969 [5.3963459]

B:BD[13.5106] → [13.5106:5208]

                if (delay.parm1 == you.equip[EQ_BOOTS])
                    you.equip[EQ_BOOTS] = -1;

[13.5106]

[13.5208]

                if (delay.parm1 == you.equip[slot])
                    you.equip[slot] = -1;

Replacement in crawl-ref/source/beam.cc at line 3468 [5.4128068]
∅:D[16.4261] → [17.15407:15454]
B:BD[5.4224988] → [17.15407:15454]
```
                if (you.equip[EQ_SHIELD] != -1
```
[16.4261]
[18.36806]
```
                if (you.shield()
```
Replacement in crawl-ref/source/acr.cc at line 1495 [5.4397395]
B:BD[19.16841] → [20.18487:18512]
```
        _world_reacts();
```
[19.16841]
[6.1259406]
```
        if (you.time_taken)
            _world_reacts();
```

Fix 2041934: auto-swapping rings and amulets was taking twice as long

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/item_use.cc at line 312 [5.2781507]

Replacement in crawl-ref/source/item_use.cc at line 3162 [5.2781507]

Replacement in crawl-ref/source/food.cc at line 134 [5.3043806]

Replacement in crawl-ref/source/food.cc at line 159 [5.3043806]

Insertion in crawl-ref/source/food.cc at line 170 [5.3043806]

Replacement in crawl-ref/source/food.cc at line 189 [5.3043806]

Replacement in crawl-ref/source/fight.cc at line 60 [5.3140790]

Insertion in crawl-ref/source/delay.cc at line 875 [5.3963459]

Insertion in crawl-ref/source/delay.cc at line 884 [5.3963459]

Replacement in crawl-ref/source/delay.cc at line 938 [5.3963459]

Replacement in crawl-ref/source/delay.cc at line 942 [5.3963459]

Replacement in crawl-ref/source/delay.cc at line 946 [5.3963459]