fiddlerwoaroof/crawl - Change LH2E37LV4XOP5HABYSS4PEJ3DRXMRI2R5SZ7J6P3E576PELY6GMQC

Fix bad messaging when monsters drop an item which stacks with something

on the floor. Fixes [2514315].

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

Created by haranp on February 3, 2009

LH2E37LV4XOP5HABYSS4PEJ3DRXMRI2R5SZ7J6P3E576PELY6GMQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/mon-util.cc at line 4379 [4.1699344]
B:BD[3.6013] → [3.6013:6051]
```
    item_def &item(mitm[item_index]);
```
[3.6013]
[5.9228]
```
    item_def* pitem = &mitm[item_index];
```
Replacement in crawl-ref/source/mon-util.cc at line 4387 [4.1699344]
B:BD[6.7332] → [3.6052:6093]
```
        if (!unequip(item, eslot, near))
```
[6.7332]
[6.7380]
```
        if (!unequip(*pitem, eslot, near))
```
Replacement in crawl-ref/source/mon-util.cc at line 4394 [4.1699344]
B:BD[5.9388] → [3.6122:6160]
```
    if (item.flags & ISFLAG_SUMMONED)
```
[5.9388]
[3.6160]
```
    if (pitem->flags & ISFLAG_SUMMONED)
```

Replacement in crawl-ref/source/mon-util.cc at line 4400 [4.1699344]

B:BD[3.6267] → [3.6267:6373]

                 item.name(DESC_CAP_THE).c_str(),
                 summoned_poof_msg(this, item).c_str(),

[3.6267]

[3.6373]

                 pitem->name(DESC_CAP_THE).c_str(),
                 summoned_poof_msg(this, *pitem).c_str(),

Replacement in crawl-ref/source/mon-util.cc at line 4403 [4.1699344]

B:BD[3.6420] → [3.6420:6473]

                 item.quantity > 1 ? "them" : "it");

[3.6420]

[3.6473]

                 pitem->quantity > 1 ? "them" : "it");

Replacement in crawl-ref/source/mon-util.cc at line 4405 [4.1699344]
B:BD[3.6474] → [3.6474:6518]
```
        item_was_destroyed(item, mindex());
```
[3.6474]
[2.5360]
```
        item_was_destroyed(*pitem, mindex());
```
Replacement in crawl-ref/source/mon-util.cc at line 4412 [4.1699344]
B:BD[6.7538] → [3.6578:6616]
```
            equip(item, eslot, near);
```
[6.7538]
[6.7583]
```
            equip(*pitem, eslot, near);
```

Insertion in crawl-ref/source/mon-util.cc at line 4417 [4.1699344]

[7.23509]

[3.6617]

    // move_item_to_grid could change item_index, so
    // update pitem.
    pitem = &mitm[item_index];

Replacement in crawl-ref/source/mon-util.cc at line 4424 [4.1699344]

B:BD[3.6674] → [3.6674:6724]

            item.flags |= ISFLAG_DROPPED_BY_ALLY;

[3.6674]

[5.9541]

            pitem->flags |= ISFLAG_DROPPED_BY_ALLY;

Replacement in crawl-ref/source/mon-util.cc at line 4428 [4.1699344]

B:BD[3.6818] → [3.6818:6869]

                 item.name(DESC_NOCAP_A).c_str());

[3.6818]

[3.6869]

                 pitem->name(DESC_NOCAP_A).c_str());

Replacement in crawl-ref/source/mon-util.cc at line 4436 [4.1699344]

B:BD[3.7082] → [3.7082:7130]

            item_was_destroyed(item, mindex());

[3.7082]

[3.7130]

            item_was_destroyed(*pitem, mindex());

Fix bad messaging when monsters drop an item which stacks with something

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/mon-util.cc at line 4379 [4.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 4387 [4.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 4394 [4.1699344]