fiddlerwoaroof/crawl - Change 3YAWEKEQ7P2OL2X3H53DHI7IMAKH6GDQ7NE5GBNYN7O64L3NEDSAC

Ooops, wasn't actually prompting player for weapon swap if butchery was

interrupted by a monster coming into view.

Also, give "monster comes into view" warning message if butchery is interrupted.

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

Created by zelgadis on December 2, 2008

3YAWEKEQ7P2OL2X3H53DHI7IMAKH6GDQ7NE5GBNYN7O64L3NEDSAC

Dependencies

In channels

main

Change contents

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

[3.4520]

[4.3345]

        // Corpse keeps track of work in plus2 field, see handle_delay(). -- bwr

Replacement in crawl-ref/source/delay.cc at line 354 [5.3963459]
B:BD[4.3387] → [4.3387:3429]
```
        bool butcher_swap_warn   = false;
```
[4.3387]
[4.3429]
```
        bool butcher_swap_setup  = false;
```

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

B:BD[4.3533] → [4.3533:3577]

                butcher_swap_warn   = true;

[4.3533]

[3.5115]

                butcher_swap_setup  = true;

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

B:BD[4.3589] → [4.3589:3662]

        if (!butcher_swap_warn && delays_cleared[DELAY_WEAPON_SWAP] > 0)

[4.3589]

[4.3662]

        if (!butcher_swap_setup && delays_cleared[DELAY_WEAPON_SWAP] > 0)

Replacement in crawl-ref/source/delay.cc at line 377 [5.3963459]
B:BD[4.3672] → [4.3672:3712]
```
            butcher_swap_warn   = true;
```
[4.3672]
[4.3712]
```
            butcher_swap_setup  = true;
```

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

B:BD[3.5454] → [6.4523:4604]

∅:D[6.4604] → [7.844:875]

∅:D[8.12563] → [7.844:875]

B:BD[5.3965114] → [7.844:875]

B:BD[7.875] → [9.2109:2119]

∅:D[3.5534] → [10.401:536]

B:BD[9.2119] → [10.401:536]

B:BD[10.536] → [8.12564:12578]

∅:D[8.12578] → [10.536:641]

B:BD[10.536] → [10.536:641]

B:BD[10.641] → [8.12579:12593]

B:BD[8.12593] → [3.5535:5750]

        // Corpse keeps track of work in plus2 field, see handle_delay(). -- bwr
        if (butcher_swap_warn)
        {
            std::string weapon;
            if (butcher_swap_weapon == -1)
                weapon = "unarmed combat";
            else
            {
                weapon = "your " +
                    you.inv[butcher_swap_weapon].name(DESC_BASENAME);
            }
            mprf(MSGCH_WARN, "You stop %s the corpse%s; not switching "
                             "back to %s.", butcher_verb.c_str(),
                             (multiple_corpses ? "s" : ""), weapon.c_str());

[3.5454]

[11.11026]

        mprf("You stop %s the corpse%s.", butcher_verb.c_str(),
             multiple_corpses ? "s" : "");
        _pop_delay();

Insertion in crawl-ref/source/delay.cc at line 391 [5.3963459]
[11.11027]
[2.4221]
```
        if (butcher_swap_setup)
        {
```

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

∅:D[10.708] → [9.2350:2360]

∅:D[4.3932] → [9.2350:2360]

∅:D[2.4582] → [9.2350:2360]

∅:D[6.4878] → [9.2350:2360]

∅:D[3.5750] → [9.2350:2360]

B:BD[9.2350] → [9.2350:2360]

∅:D[9.2360] → [7.1012:1025]

B:BD[7.1012] → [7.1012:1025]

B:BD[7.1025] → [6.4879:4889]

∅:D[6.4889] → [12.3174:3289]

B:BD[7.1025] → [12.3174:3289]

        }
        else
        {
            mprf("You stop %s the corpse%s.", butcher_verb.c_str(),
                 multiple_corpses ? "s" : "");

[2.4582]

[6.4890]


            // Possibly prompt if user wants to switch back from
            // butchering tool in order to use their normal weapon to
            // fight the interrupting monster.
            if (!i_feel_safe())
                handle_interrupted_swap(false, true);

Deletion in crawl-ref/source/delay.cc at line 407 [5.3963459]
B:BD[8.12595] → [13.23734:23756]
```
        _pop_delay();
```

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

[2.4589]

}
static bool _is_butcher_delay(int delay)
{
    return (delay == DELAY_BUTCHER || delay == DELAY_BOTTLE_BLOOD
            || delay == DELAY_OFFER_CORPSE);

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

B:BD[2.4714] → [2.4714:4756]

        || !you_tran_can_wear(EQ_WEAPON))

[2.4714]

[2.4756]

        || !you_tran_can_wear(EQ_WEAPON) || you.cannot_act())

Insertion in crawl-ref/source/delay.cc at line 554 [5.3963459]
[2.5152]
[2.5152]
```
    const char* prompt_str = "Switch back from butchering tool?";
```

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

B:BD[2.5900] → [2.5900:6009]

        if (prompt && yesno("Switch back from butchering tool?", false)
            || safe && swap_if_safe)

[2.5900]

[2.6009]

        if (prompt && yesno(prompt_str, false) || safe && swap_if_safe)

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

B:BD[2.6355] → [2.6355:6464]

        if (delay == DELAY_BUTCHER || delay == DELAY_BOTTLE_BLOOD
           || delay == DELAY_OFFER_CORPSE)

[2.6355]

[2.6464]

        if (_is_butcher_delay(delay)
            && (safe || prompt && yesno(prompt_str, false)))

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

B:BD[8.12911] → [2.6689:6765]

    else if (!prompt || !yesno("Switch back from butchering tool?", false))

[8.12911]

[2.6765]

    else if (!prompt || !yesno(prompt_str, false))

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

B:BD[14.2088] → [15.3176:3229]

    if (ai == AI_SEE_MONSTER && is_run_delay(atype))

[14.2088]

[14.2143]

    if (ai == AI_SEE_MONSTER && (is_run_delay(atype)
                                 || _is_butcher_delay(atype)))