fiddlerwoaroof/crawl - Change L5W2SXCJEVQOLRIN2IQO3AITQGHAS7PYSL4I7M5BQMG7MYZ2AQQQC

Fix 1952094: Don't output (un)equipping messages for the alternate

         weapon slot unless the monster is capable of dual wielding.

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

Created by j-p-e-g on April 26, 2008

L5W2SXCJEVQOLRIN2IQO3AITQGHAS7PYSL4I7M5BQMG7MYZ2AQQQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/religion.cc at line 1247 [3.804403]
B:BD[2.4463] → [2.4463:4512]
```
    // the above attempts all were unsuccessful.
```
[2.4463]
[4.2523]
```
    // the above attempts were all unsuccessful.
```

Replacement in crawl-ref/source/mon-util.cc at line 2966 [3.1699344]

B:BD[5.5676] → [6.3923:3977]

void monsters::equip_weapon(item_def &item, int near)

[5.5676]

[5.5736]

void monsters::equip_weapon(item_def &item, int near, bool msg)

Replacement in crawl-ref/source/mon-util.cc at line 2968 [3.1699344]

B:BD[5.5738] → [6.3978:4006]

    if (need_message(near))

[5.5738]

[7.3868]


    if (msg && !need_message(near))
        msg = false;
    if (msg)

Replacement in crawl-ref/source/mon-util.cc at line 2983 [3.1699344]
B:BD[5.5837] → [5.5837:5890]
```
    if (brand != SPWPN_NORMAL && need_message(near))
```
[5.5837]
[5.5890]
```
    if (msg && brand != SPWPN_NORMAL)
```

Replacement in crawl-ref/source/mon-util.cc at line 3056 [3.1699344]

B:BD[5.7182] → [5.7182:7216]

        equip_weapon(item, near);

[5.7037]

[5.7216]

    {
        bool give_msg = (slot == MSLOT_WEAPON
                         || slot == MSLOT_ALT_WEAPON
                            && mons_wields_two_weapons(this));
        equip_weapon(item, near, give_msg);

Insertion in crawl-ref/source/mon-util.cc at line 3063 [3.1699344]
[5.7231]
[5.7231]
```
    }
```

Replacement in crawl-ref/source/mon-util.cc at line 3072 [3.1699344]

B:BD[6.4965] → [6.4965:5021]

void monsters::unequip_weapon(item_def &item, int near)

[6.4965]

[6.5021]

void monsters::unequip_weapon(item_def &item, int near, bool msg)

Replacement in crawl-ref/source/mon-util.cc at line 3074 [3.1699344]

B:BD[6.5023] → [6.5023:5051]

    if (need_message(near))

[6.5023]

[8.8208]

    if (msg && !need_message(near))
        msg = false;
    if (msg)

Replacement in crawl-ref/source/mon-util.cc at line 3088 [3.1699344]
B:BD[6.5258] → [6.5258:5311]
```
    if (brand != SPWPN_NORMAL && need_message(near))
```
[6.5258]
[6.5311]
```
    if (msg && brand != SPWPN_NORMAL)
```

Replacement in crawl-ref/source/mon-util.cc at line 3156 [3.1699344]

B:BD[5.7830] → [6.6748:6799]

        unequip_weapon(item, near);
        break;

[5.7830]

[6.6799]

    {
        bool give_msg = (slot == MSLOT_WEAPON
                         || slot == MSLOT_ALT_WEAPON
                            && mons_wields_two_weapons(this));

Replacement in crawl-ref/source/mon-util.cc at line 3161 [3.1699344]

B:BD[6.6800] → [6.6800:6976]

    // Armour swapping not implemented yet, but armour can be
    // removed if wizard forces monster to wear a new piece of
    // armour with the "give item" wizard command.

[6.6800]

[6.6976]

        unequip_weapon(item, near, give_msg);
        break;
    }

Insertion in crawl-ref/source/mon-util.cc at line 3333 [3.1699344]
[9.11706]
[10.3721]
```
            // Don't drop weapons specific to the monster.
```

Replacement in crawl-ref/source/externs.h at line 1249 [3.3270163]

B:BD[5.23074] → [6.10247:10296]

    void equip_weapon(item_def &item, int near);

[5.23074]

[6.10296]

    void equip_weapon(item_def &item, int near, bool msg = true);

Replacement in crawl-ref/source/externs.h at line 1251 [3.3270163]

B:BD[6.10345] → [6.10345:10396]

    void unequip_weapon(item_def &item, int near);

[6.10345]

[6.10396]

    void unequip_weapon(item_def &item, int near, bool msg = true);

Replacement in crawl-ref/init.txt at line 104 [3.4830895]
B:BD[11.2965] → [2.9779:9814]
```
# default_friendly_pickup = friend
```
[11.2965]
[12.2920]
```
# default_friendly_pickup = (none | friend | all)
```

Fix 1952094: Don't output (un)equipping messages for the alternate

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/religion.cc at line 1247 [3.804403]

Replacement in crawl-ref/source/mon-util.cc at line 2966 [3.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2968 [3.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2983 [3.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 3056 [3.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 3063 [3.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 3072 [3.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 3074 [3.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 3088 [3.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 3156 [3.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 3161 [3.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 3333 [3.1699344]

Replacement in crawl-ref/source/externs.h at line 1249 [3.3270163]

Replacement in crawl-ref/source/externs.h at line 1251 [3.3270163]

Replacement in crawl-ref/init.txt at line 104 [3.4830895]