fiddlerwoaroof/crawl - Change P25D567E2UEAQHNI7LAZPNY7KAI3J4OE77YKLWOIEEALC5RREJHAC

If butchering with a swapped weapon is interrupted, then switch back

to the non-butchering weapon as soon as the player is safe again. Enabled by setting option "swap_when_safe" to true.

Also, fixed a bug where "not switching back" message wasn't always being given when butchering was interrupted.

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

Created by zelgadis on May 30, 2008

P25D567E2UEAQHNI7LAZPNY7KAI3J4OE77YKLWOIEEALC5RREJHAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/item_use.cc at line 761 [5.2781507]
[4.734175]
[5.2796406]
```
    you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED] = 0;
```
Insertion in crawl-ref/source/it_use2.cc at line 525 [5.2904329]
[6.3619]
[5.2916235]
```
    you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED] = 0;
```
Insertion in crawl-ref/source/initfile.cc at line 674 [5.2957258]
[3.2742]
[7.3745]
```
    swap_when_safe         = false;
```
Insertion in crawl-ref/source/initfile.cc at line 1889 [5.2957258]
[3.2814]
[8.5692]
```
    else BOOL_OPTION(swap_when_safe);
```

Insertion in crawl-ref/source/externs.h at line 1638 [5.3270163]

[3.3003]

[9.3613]

    bool        swap_when_safe;  // If autoswapped butchery was interrupted,
                                 // swap weapon back when safe.

Insertion in crawl-ref/source/enum.h at line 181 [5.3287960]
[10.7041]
[11.14625]
```
    ATTR_WEAPON_SWAP_INTERRUPTED,
```

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

[4.994863]

static int delays_cleared[NUM_DELAYS];
static int cleared_delays_parm1[NUM_DELAYS];

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

[4.994900]

    memset(delays_cleared, 0, sizeof(delays_cleared));
    memset(cleared_delays_parm1, 0, sizeof(cleared_delays_parm1));

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

[12.3458]

[4.994939]


        delays_cleared[delay.type]++;
        cleared_delays_parm1[delay.type] = delay.parm1;

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

B:BD[2.4520] → [2.4520:4628]

        bool multiple_corpses  = false;
        bool butcher_swap_warn = false;
        int wpn_delay = -1;

[2.4520]

[2.4628]

        bool multiple_corpses    = false;
        bool butcher_swap_warn   = false;
        int  butcher_swap_weapon = 0;

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

B:BD[2.5042] → [2.5042:5115]

                wpn_delay = i;
                butcher_swap_warn = true;

[2.5042]

[2.5115]

                butcher_swap_weapon = you.delay_queue[i].parm1;
                butcher_swap_warn   = true;

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

[2.5192]

        }
        if (!butcher_swap_warn && delays_cleared[DELAY_WEAPON_SWAP] > 0)
        {
            butcher_swap_warn   = true;
            butcher_swap_weapon = cleared_delays_parm1[DELAY_WEAPON_SWAP];

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

B:BD[13.2119] → [2.5455:5534]

            const int butcher_swap_weapon = you.delay_queue[wpn_delay].parm1;

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

[2.5750]

[13.2350]


            if (Options.swap_when_safe)
                you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED]
                    = butcher_swap_weapon;

Insertion in crawl-ref/source/acr.cc at line 1417 [5.4397395]

[14.901]

[4.1259311]

    if (i_feel_safe() && you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED])
    {
        weapon_switch(you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED]);
        print_stats();
        // To prevent spam in case the weapon can't be switched back to.
        you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED] = 0;
    }

Insertion in crawl-ref/settings/init.txt at line 209 [5.4830895]
[3.4607]
[15.1040]
```
# swap_when_safe         = true
```

Insertion in crawl-ref/docs/options_guide.txt at line 919 [16.63392]

[3.5134]

[15.27004]

swap_when_safe = false
        If both this and easy_butcher are true, then if an auto-switch
        butchery is interupted, then the auto-switch will be reversed
        as soon as your safe again.