fiddlerwoaroof/crawl - Change ODSARKFWKP2ZXJYUHXMLHGJUOX3OBRO25IHNCHWNRCGLTPWKH3QQC

Fix bug #2569430: Throwing temporarily branded weapon makes brand permanent.

When throwing a wielded weapon, give the "you are now empty handed" message last.

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

Created by zelgadis on February 6, 2009

ODSARKFWKP2ZXJYUHXMLHGJUOX3OBRO25IHNCHWNRCGLTPWKH3QQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/item_use.cc at line 2280 [3.2781507]

[2.18640]

    // Figure out if we're thrown or launched.
    const launch_retval projected = is_launched(&you, you.weapon(), thrown);

Insertion in crawl-ref/source/item_use.cc at line 2287 [3.2781507]

[2.18807]

[4.3069]


    // Items that get a temporary brand from a player spell lose the
    // brand as soon as the player lets go of the item.  Can't call
    // unwield_item() yet since the beam might get canceled.
    if (you.duration[DUR_WEAPON_BRAND] && projected == LRET_THROWN)
        set_item_ego_type( item, OBJ_WEAPONS, SPWPN_NORMAL );

Deletion in crawl-ref/source/item_use.cc at line 2304 [3.2781507]
B:BD[4.3227] → [5.4905:4952]
B:BD[5.4952] → [6.2697:2774]
B:BD[4.3648] → [4.3648:3649]
```
    // Figure out if we're thrown or launched.
    const launch_retval projected = is_launched(&you, you.weapon(), thrown);
```

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

B:BD[4.5499] → [6.2961:3060]

    // Must unwield before making a copy in order to remove things
    // like temporary branding.

[4.5499]

[6.3060]

    bool unwielded = false;

Replacement in crawl-ref/source/item_use.cc at line 2372 [3.2781507]
B:BD[7.1254] → [4.5561:5599]
```
        canned_msg(MSG_EMPTY_HANDED);
```
[7.1254]
[3.2813392]
```
        unwielded = true;
```

Insertion in crawl-ref/source/item_use.cc at line 2999 [3.2781507]

[8.3896]

[9.5192]

        if (unwielded)
            canned_msg(MSG_EMPTY_HANDED);