fiddlerwoaroof/crawl - Change TXXTMCDBT5IXMP2MRC23P3DVL4BCKBRUPTWSIG5XSQ7YOMFGBR7AC

Fix 2039217: check shield status for non-weapons before allowing wield.

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

Created by haranp on August 6, 2008

TXXTMCDBT5IXMP2MRC23P3DVL4BCKBRUPTWSIG5XSQ7YOMFGBR7AC

Dependencies

In channels

main

Change contents

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

B:BD[4.729898] → [4.729898:729997]

    // We don't have to check explicitly for staves - all staves are wieldable
    // by everyone.

[4.729898]

[4.729997]

    // All non-weapons only need a shield check.

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

B:BD[4.730039] → [4.730039:730062]

        return (true);

[4.730039]

[6.362951]

    {
        if (!ignore_temporary_disability && is_shield_incompatible(*weapon))
        {
            SAY(mpr("You can't wield that with a shield."));
            return (false);
        }
        else
            return (true);
    }

Insertion in crawl-ref/source/item_use.cc at line 303 [5.2781507]
[5.2785100]
[3.8525]
```
            item_def& wpn = *you.weapon();
```

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

∅:D[3.8573] → [7.3365:3449]

B:BD[7.3365] → [7.3365:3449]

            if (has_warning_inscription(you.inv[you.equip[EQ_WEAPON]], OPER_WIELD))

[3.8573]

[7.3449]

            if (has_warning_inscription(wpn, OPER_WIELD))

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

B:BD[7.3519] → [7.3519:3597]

                prompt += you.inv[you.equip[EQ_WEAPON]].name(DESC_INVENTORY);

[7.3519]

[7.3597]

                prompt += wpn.name(DESC_INVENTORY);

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

B:BD[5.2785713] → [7.3752:3799]

    if (!can_wield(&you.inv[item_slot], true))

[5.2785713]

[7.3799]

    item_def& new_wpn(you.inv[item_slot]);
    if (!can_wield(&new_wpn, true))

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

∅:D[2.7849] → [7.3870:3953]

B:BD[7.3870] → [7.3870:3953]

    if (auto_wield && !check_warning_inscriptions(you.inv[item_slot], OPER_WIELD))

[2.7849]

[8.886]

    if (auto_wield && !check_warning_inscriptions(new_wpn, OPER_WIELD))

Replacement in crawl-ref/source/item_use.cc at line 339 [5.2781507]
∅:D[2.7875] → [8.911:971]
B:BD[8.911] → [8.911:971]
```
    if (!safe_to_remove_or_wear(you.inv[item_slot], false))
```
[2.7875]
[4.731818]
```
    if (!safe_to_remove_or_wear(new_wpn, false))
```

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

B:BD[5.2788551] → [9.21732:21796]

    mpr(you.inv[item_slot].name(DESC_INVENTORY_EQUIP).c_str());

[5.2788551]

[5.2788630]

    mpr(new_wpn.name(DESC_INVENTORY_EQUIP).c_str());