fiddlerwoaroof/crawl - Change 7FE64DAORZGC7DXJIUVO6AE5XTO3E3W2OUFYRWXL57VIONBHVLWAC

Do nothing if unwielding a non-weapon artefact

Fix a bug where wielding a non-weapon artefact would do nothing, but unwielding it would could change your stats, leading to permanent stat loss (or permanent stat gain). Now unwielding an artefact armor/jewellery which you accidently wielded has no effect.

Created by Matthew Cline on October 24, 2009

7FE64DAORZGC7DXJIUVO6AE5XTO3E3W2OUFYRWXL57VIONBHVLWAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/itemprop.h at line 738 [4.641567]
[3.33394]
[4.646415]
```
equipment_type get_item_slot(const item_def& item);
```

Insertion in crawl-ref/source/itemprop.cc at line 2736 [4.646661]

[3.33758]

equipment_type get_item_slot(const item_def& item)
{
    return get_item_slot(item.base_type, item.sub_type);
}

Insertion in crawl-ref/source/it_use2.cc at line 479 [7.2904329]
[5.4441]
[6.30400]
```
    const bool is_weapon = get_item_slot(item) == EQ_WEAPON;
```
Replacement in crawl-ref/source/it_use2.cc at line 482 [7.2904329]
B:BD[6.30401] → [5.4442:4487]
```
    if (!safe_to_remove_or_wear(item, true))
```
[6.30401]
[8.4143]
```
    if (is_weapon && !safe_to_remove_or_wear(item, true))
```
Replacement in crawl-ref/source/it_use2.cc at line 491 [7.2904329]
B:BD[2.13711] → [2.13711:13740]
```
    if (is_artefact( item ))
```
[2.13711]
[2.13740]
```
    if (is_weapon && is_artefact( item ))
```

Do nothing if unwielding a non-weapon artefact

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/itemprop.h at line 738 [4.641567]

Insertion in crawl-ref/source/itemprop.cc at line 2736 [4.646661]

Insertion in crawl-ref/source/it_use2.cc at line 479 [7.2904329]

Replacement in crawl-ref/source/it_use2.cc at line 482 [7.2904329]

Replacement in crawl-ref/source/it_use2.cc at line 491 [7.2904329]