fiddlerwoaroof/crawl - Change 2J3TK3NYTO5XO6IHLTV5O6B3HYN2NHXD5ST3WLL5KPTUOVS5F3RQC

When MF_HARD_RESET monsters die/reset/etc, destroy the items they hold so they

don't hang around cluttering up mitm[]

Don't set the values of a cell from mitm[] unless it's sure to be used; using it as a scratch object or partially setting it up and then bailing clutters up mitm[] with valid but unused items, preventing those slots from being used.

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

Created by zelgadis on January 7, 2009

2J3TK3NYTO5XO6IHLTV5O6B3HYN2NHXD5ST3WLL5KPTUOVS5F3RQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/monstuff.cc at line 369 [4.1396662]

∅:D[3.11792] → [4.1404912:1404981]

B:BD[4.1404912] → [4.1404912:1404981]

B:BD[4.1404981] → [3.11793:11857]

    int o = get_item_slot();
    if (o == NON_ITEM)
        return;
    const int corpse_class = fill_out_corpse(monster, mitm[o]);

[3.11792]

[4.1405313]

    item_def corpse;
    const int corpse_class = fill_out_corpse(monster, corpse);

Replacement in crawl-ref/source/monstuff.cc at line 380 [4.1396662]

B:BD[5.2825] → [5.2825:2906]

        item_was_destroyed(mitm[o]);
        mitm[o].base_type = OBJ_UNASSIGNED;

[5.2825]

[5.2906]

        item_was_destroyed(corpse);

Insertion in crawl-ref/source/monstuff.cc at line 383 [4.1396662]

[5.2928]

[6.3309]


    int o = get_item_slot();
    if (o == NON_ITEM)
        return;
    mitm[o] = corpse;

Insertion in crawl-ref/source/monstuff.cc at line 1637 [4.1396662]

[7.7477]

[4.1418882]

    else
    {
        // Destroy the items belonging to MF_HARD_RESET monsters so they
        // don't clutter up mitm[]
        for (int i = 0; i < NUM_MONSTER_SLOTS; i++)
        {
            int item = monster->inv[i];
            if (item != NON_ITEM)
            {
                destroy_item(item);
                monster->inv[i] = NON_ITEM;
            }
        }
    }

Deletion in crawl-ref/source/makeitem.cc at line 3026 [8.927]
B:BD[8.103728] → [8.103728:103764]
```
    const int bp = get_item_slot();
```
Deletion in crawl-ref/source/makeitem.cc at line 3027 [8.927]
B:BD[8.103793] → [9.5633:5634]
∅:D[9.5634] → [8.103798:103862]
B:BD[8.103798] → [8.103798:103862]
```
    if (bp == NON_ITEM)
        return (MAKE_ITEM_RANDOM_RACE);
```
Replacement in crawl-ref/source/makeitem.cc at line 3028 [8.927]
B:BD[8.103863] → [8.103863:103894]
```
    item_def &item = mitm[bp];
```
[8.103863]
[10.287]
```
    item_def               item;
```
Deletion in crawl-ref/source/makeitem.cc at line 3671 [8.927]
B:BD[8.123266] → [11.61015:61037]
∅:D[11.61037] → [8.123298:123325]
B:BD[8.123298] → [8.123298:123325]
```
    item.pos.reset();
    item.link = NON_ITEM;
```

Replacement in crawl-ref/source/makeitem.cc at line 3686 [8.927]

B:BD[8.123873] → [8.123873:123987]

        ((force_item) ? bp : items( 0, xitc, xitt, true,
                                    level, item_race) );

[8.123873]

[8.123987]

        ((force_item) ? get_item_slot() : items( 0, xitc, xitt, true,
                                                 level, item_race) );

Insertion in crawl-ref/source/makeitem.cc at line 3692 [8.927]

[8.124052]

[12.397]

    // Copy temporary item into the item array if were forcing it, since
    // items() won't have done it for us.
    if (force_item)
        mitm[thing_created] = item;

Deletion in crawl-ref/source/makeitem.cc at line 3974 [8.927]
B:BD[8.125266] → [8.125266:125343]
```
    const int bp = get_item_slot();
    if (bp == NON_ITEM)
        return;
```
Insertion in crawl-ref/source/makeitem.cc at line 3980 [8.927]
[8.125592]
[8.125592]
```
    item_def item;
```

Replacement in crawl-ref/source/makeitem.cc at line 3987 [8.927]

B:BD[13.6486] → [14.2724:2765]

∅:D[14.2765] → [13.6535:6583]

B:BD[13.6535] → [13.6535:6583]

        mitm[bp].base_type = OBJ_ARMOUR;
        mitm[bp].sub_type = ARM_LEATHER_ARMOUR;

[13.6486]

[13.6583]

        item.base_type = OBJ_ARMOUR;
        item.sub_type = ARM_LEATHER_ARMOUR;

Replacement in crawl-ref/source/makeitem.cc at line 4024 [8.927]
B:BD[8.126621] → [8.126621:126666]
```
            mitm[bp].base_type = OBJ_ARMOUR;
```
[8.126621]
[8.126666]
```
            item.base_type = OBJ_ARMOUR;
```

Replacement in crawl-ref/source/makeitem.cc at line 4032 [8.927]

B:BD[8.126793] → [8.126793:126849]

                mitm[bp].sub_type = ARM_LEATHER_ARMOUR;

[8.126793]

[8.126849]

                item.sub_type = ARM_LEATHER_ARMOUR;

Replacement in crawl-ref/source/makeitem.cc at line 4036 [8.927]

B:BD[8.126912] → [8.126912:126963]

                mitm[bp].sub_type = ARM_RING_MAIL;

[8.126912]

[8.126963]

                item.sub_type = ARM_RING_MAIL;

Replacement in crawl-ref/source/makeitem.cc at line 4039 [8.927]

B:BD[8.127006] → [8.127006:127058]

                mitm[bp].sub_type = ARM_SCALE_MAIL;

[8.127006]

[8.127058]

                item.sub_type = ARM_SCALE_MAIL;

Replacement in crawl-ref/source/makeitem.cc at line 4042 [8.927]

B:BD[8.127101] → [8.127101:127153]

                mitm[bp].sub_type = ARM_CHAIN_MAIL;

[8.127101]

[8.127153]

                item.sub_type = ARM_CHAIN_MAIL;

Replacement in crawl-ref/source/makeitem.cc at line 4055 [8.927]

B:BD[8.127355] → [8.127355:127457]

        mitm[bp].base_type = OBJ_ARMOUR;
        mitm[bp].sub_type = ARM_LEATHER_ARMOUR + random2(4);

[8.127355]

[8.127457]

        item.base_type = OBJ_ARMOUR;
        item.sub_type = ARM_LEATHER_ARMOUR + random2(4);

Replacement in crawl-ref/source/makeitem.cc at line 4077 [8.927]

B:BD[8.128006] → [8.128006:128104]

        mitm[bp].base_type = OBJ_ARMOUR;
        mitm[bp].sub_type = ARM_CHAIN_MAIL + random2(4);

[8.128006]

[8.128104]

        item.base_type = OBJ_ARMOUR;
        item.sub_type = ARM_CHAIN_MAIL + random2(4);

Replacement in crawl-ref/source/makeitem.cc at line 4085 [8.927]

B:BD[8.128224] → [8.128224:128303]

        mitm[bp].base_type = OBJ_ARMOUR;
        mitm[bp].sub_type = ARM_ROBE;

[8.128224]

[8.128303]

        item.base_type = OBJ_ARMOUR;
        item.sub_type = ARM_ROBE;

Replacement in crawl-ref/source/makeitem.cc at line 4101 [8.927]

B:BD[15.745] → [15.745:790]

B:BD[15.790] → [16.4645:4699]

            mitm[bp].base_type = OBJ_ARMOUR;
            mitm[bp].sub_type  = ARM_CENTAUR_BARDING;

[15.745]

[15.843]

            item.base_type = OBJ_ARMOUR;
            item.sub_type  = ARM_CENTAUR_BARDING;

Replacement in crawl-ref/source/makeitem.cc at line 4118 [8.927]

B:BD[10.837] → [10.837:882]

B:BD[10.882] → [16.4700:4751]

            mitm[bp].base_type = OBJ_ARMOUR;
            mitm[bp].sub_type  = ARM_NAGA_BARDING;

[10.837]

[10.932]

            item.base_type = OBJ_ARMOUR;
            item.sub_type  = ARM_NAGA_BARDING;

Replacement in crawl-ref/source/makeitem.cc at line 4123 [8.927]

B:BD[10.1021] → [10.1021:1066]

B:BD[10.1066] → [16.4752:4795]

            mitm[bp].base_type = OBJ_ARMOUR;
            mitm[bp].sub_type  = ARM_ROBE;

[10.1021]

[10.1108]

            item.base_type = OBJ_ARMOUR;
            item.sub_type  = ARM_ROBE;

Replacement in crawl-ref/source/makeitem.cc at line 4153 [8.927]

B:BD[17.704] → [17.704:783]

        mitm[bp].base_type = OBJ_ARMOUR;
        mitm[bp].sub_type = ARM_ROBE;

[17.704]

[17.783]

        item.base_type = OBJ_ARMOUR;
        item.sub_type = ARM_ROBE;

Replacement in crawl-ref/source/makeitem.cc at line 4159 [8.927]

B:BD[18.2704] → [18.2704:2797]

        mitm[bp].base_type = OBJ_ARMOUR;
        mitm[bp].sub_type = ARM_GOLD_DRAGON_ARMOUR;

[18.2704]

[18.2797]

        item.base_type = OBJ_ARMOUR;
        item.sub_type = ARM_GOLD_DRAGON_ARMOUR;

Replacement in crawl-ref/source/makeitem.cc at line 4167 [8.927]

∅:D[17.838] → [8.129308:129387]

B:BD[8.129308] → [8.129308:129387]

        mitm[bp].base_type = OBJ_ARMOUR;
        mitm[bp].sub_type = ARM_ROBE;

[17.838]

[8.129387]

        item.base_type = OBJ_ARMOUR;
        item.sub_type = ARM_ROBE;

Replacement in crawl-ref/source/makeitem.cc at line 4179 [8.927]

B:BD[8.129602] → [8.129602:129681]

        mitm[bp].base_type = OBJ_ARMOUR;
        mitm[bp].sub_type = ARM_ROBE;

[8.129602]

[8.129681]

        item.base_type = OBJ_ARMOUR;
        item.sub_type = ARM_ROBE;

Replacement in crawl-ref/source/makeitem.cc at line 4186 [8.927]

B:BD[2.22108] → [2.22108:22197]

        mitm[bp].base_type = OBJ_ARMOUR;
        mitm[bp].sub_type = ARM_LEATHER_ARMOUR;

[2.22108]

[2.22197]

        item.base_type = OBJ_ARMOUR;
        item.sub_type = ARM_LEATHER_ARMOUR;

Replacement in crawl-ref/source/makeitem.cc at line 4194 [8.927]

B:BD[8.129848] → [19.1803:1858]

∅:D[19.1858] → [8.129889:129929]

B:BD[8.129889] → [8.129889:129929]

    const object_class_type xitc = mitm[bp].base_type;
    const int xitt = mitm[bp].sub_type;

[8.129848]

[8.129929]

    const object_class_type xitc = item.base_type;
    const int xitt = item.sub_type;