fiddlerwoaroof/crawl - Change HHJZKVBVTR2WTALW2HONZF4XSDTADKTWUJIQAFGDZOJZUGXIXOJQC

[2758242] Fixing segfault during debug_mons_scan due to an mprf not matching its format string with its var args. Also, fixing clone function from chaos brand that was causing this where cloned items in monster inventories weren't setting their link to be part of the new monster's inventory. Refactoring monster holding functions into item_def, where they probably should be.

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

Created by ennewalker on April 18, 2009

HHJZKVBVTR2WTALW2HONZF4XSDTADKTWUJIQAFGDZOJZUGXIXOJQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/mstuff2.cc at line 2568 [7.1340842]
[6.7984]
[6.7984]
```
        mitm[new_index].set_holding_monster(midx);
```
Deletion in crawl-ref/source/mon-util.h at line 871 [7.1682293]
∅:D[8.2682] → [9.9408:9409]
B:BD[9.9408] → [9.9408:9409]
B:BD[9.9409] → [10.3358:3456]
```
bool      held_by_monster(const item_def &item);
monsters* holding_monster(const item_def &item);
```

Deletion in crawl-ref/source/mon-util.cc at line 4330 [7.1699344]

B:BD[11.3698] → [10.3458:3608]

∅:D[10.3608] → [12.8359:8361]

∅:D[11.3698] → [12.8359:8361]

B:BD[12.8359] → [12.8359:8361]

B:BD[12.8361] → [10.3609:3824]

∅:D[10.3824] → [12.8361:8362]

B:BD[12.8361] → [12.8361:8362]

B:BD[12.8362] → [10.3825:3851]

}
bool held_by_monster(const item_def &item)
{
    return (item.pos.equals(-2, -2)
            && !invalid_monster_index(item.link - NON_ITEM - 1));
}
monsters* holding_monster(const item_def &item)
{
    if (!item.pos.equals(-2, -2))
        return (NULL);
    const int midx = item.link - NON_ITEM - 1;
    if (invalid_monster_index(midx))
        return (NULL);
    return (&menv[midx]);

Replacement in crawl-ref/source/mon-util.cc at line 4336 [7.1699344]

B:BD[10.3889] → [10.3889:3944]

    const monsters *other_mon = holding_monster(item);

[10.3889]

[10.3944]

    const monsters *other_mon = item.holding_monster();

Replacement in crawl-ref/source/mon-util.cc at line 4428 [7.1699344]
B:BD[12.8919] → [10.5291:5358]
```
    item.pos.set(-2, -2);
    item.link = NON_ITEM + 1 + mindex();
```
[12.8919]
[10.5358]
```
    item.set_holding_monster(mindex());
```
Replacement in crawl-ref/source/misc.cc at line 305 [7.1933596]
B:BD[13.12862] → [3.2862:2895]
```
    if (!held_by_monster(blood))
```
[13.12862]
[13.13001]
```
    if (!blood.held_by_monster())
```

Replacement in crawl-ref/source/misc.cc at line 395 [7.1933596]

B:BD[14.6730] → [3.4288:4382]

    if (held_by_monster(blood))
        move_item_to_grid(&o, holding_monster(blood)->pos());

[14.6730]

[3.4382]

    if (blood.held_by_monster())
        move_item_to_grid(&o, blood.holding_monster()->pos());

Replacement in crawl-ref/source/makeitem.cc at line 3032 [15.927]
B:BD[10.5579] → [10.5579:5623]
```
    ASSERT(holding_monster(mthing) == mon);
```
[10.5579]
[16.5584]
```
    ASSERT(mthing.holding_monster() == mon);
```
Replacement in crawl-ref/source/items.cc at line 117 [7.2584728]
B:BD[10.5845] → [10.5845:5883]
```
        if (held_by_monster(mitm[i]))
```
[10.5845]
[10.5883]
```
        if (mitm[i].held_by_monster())
```
Replacement in crawl-ref/source/items.cc at line 371 [7.2584728]
B:BD[7.2593238] → [10.5991:6044]
```
    monsters* monster = holding_monster(mitm[dest]);
```
[7.2593238]
[10.6044]
```
    monsters* monster = mitm[dest].holding_monster();
```

Insertion in crawl-ref/source/items.cc at line 2691 [7.2584728]

[12.21399]


monsters* item_def::holding_monster() const
{
    if (!pos.equals(-2, -2))
        return (NULL);
    const int midx = link - NON_ITEM - 1;
    if (invalid_monster_index(midx))
        return (NULL);
    return (&menv[midx]);
}
void item_def::set_holding_monster(int midx)
{
    ASSERT(midx != NON_MONSTER);
    pos.set(-2, -2);
    link = NON_ITEM + 1 + midx;
}
bool item_def::held_by_monster() const
{
    return (pos.equals(-2, -2) && !invalid_monster_index(link - NON_ITEM - 1));
}

Insertion in crawl-ref/source/externs.h at line 623 [7.3270163]

[17.440823]

[18.27400]


    // Sets this item as being held by a given monster.
    void set_holding_monster(int midx);
    // Returns monster holding this item.  NULL if none.
    monsters* holding_monster() const;
    // Returns true if a monster is holding this item.
    bool held_by_monster() const;

Replacement in crawl-ref/source/dungeon.cc at line 1092 [7.3429798]
B:BD[10.7414] → [10.7414:7452]
```
            || held_by_monster(item))
```
[10.7414]
[10.7452]
```
            || item.held_by_monster())
```

Replacement in crawl-ref/source/debug.cc at line 2492 [7.4016436]

B:BD[5.17089] → [5.17089:17148]

        if (!is_valid_item(item) || held_by_monster(item))

[5.17089]

[5.17148]

        if (!is_valid_item(item) || item.held_by_monster())

Replacement in crawl-ref/source/debug.cc at line 2731 [7.4016436]

B:BD[7.4053633] → [2.2790:2846]

        const monsters* mon = holding_monster(mitm[i]);

[7.4053633]

[10.7699]

        const monsters* mon = mitm[i].holding_monster();

Replacement in crawl-ref/source/debug.cc at line 3010 [7.4016436]

B:BD[10.9131] → [10.9131:9191]

            const monsters* holder = holding_monster(item);

[10.9131]

[10.9191]

            const monsters* holder = item.holding_monster();

Insertion in crawl-ref/source/debug.cc at line 3034 [7.4016436]
[4.5428]
[10.10115]
```
                     item.name(DESC_PLAIN).c_str(),
```
Replacement in crawl-ref/source/debug.cc at line 6684 [7.4016436]
B:BD[19.9067] → [19.9067:9103]
```
        if (!held_by_monster(item))
```
[19.9067]
[19.9103]
```
        if (!item.held_by_monster())
```
Replacement in crawl-ref/source/debug.cc at line 6687 [7.4016436]
B:BD[19.9223] → [19.9223:9270]
```
        else if (holding_monster(item) != mon)
```
[19.9223]
[19.9270]
```
        else if (item.holding_monster() != mon)
```

Replacement in crawl-ref/source/debug.cc at line 6689 [7.4016436]

B:BD[19.9330] → [19.9330:9397]

                    debug_mon_str(holding_monster(item)).c_str());

[19.9330]

[19.9397]

                    debug_mon_str(item.holding_monster()).c_str());

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/mstuff2.cc at line 2568 [7.1340842]

Deletion in crawl-ref/source/mon-util.h at line 871 [7.1682293]

Deletion in crawl-ref/source/mon-util.cc at line 4330 [7.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 4336 [7.1699344]

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

Replacement in crawl-ref/source/misc.cc at line 305 [7.1933596]

Replacement in crawl-ref/source/misc.cc at line 395 [7.1933596]

Replacement in crawl-ref/source/makeitem.cc at line 3032 [15.927]

Replacement in crawl-ref/source/items.cc at line 117 [7.2584728]

Replacement in crawl-ref/source/items.cc at line 371 [7.2584728]

Insertion in crawl-ref/source/items.cc at line 2691 [7.2584728]

Insertion in crawl-ref/source/externs.h at line 623 [7.3270163]

Replacement in crawl-ref/source/dungeon.cc at line 1092 [7.3429798]

Replacement in crawl-ref/source/debug.cc at line 2492 [7.4016436]

Replacement in crawl-ref/source/debug.cc at line 2731 [7.4016436]

Replacement in crawl-ref/source/debug.cc at line 3010 [7.4016436]

Insertion in crawl-ref/source/debug.cc at line 3034 [7.4016436]

Replacement in crawl-ref/source/debug.cc at line 6684 [7.4016436]

Replacement in crawl-ref/source/debug.cc at line 6687 [7.4016436]

Replacement in crawl-ref/source/debug.cc at line 6689 [7.4016436]