fiddlerwoaroof/crawl - Change MFP3WAGO2JIOT4QSEYPM4OJV5NVXMUOPL75OIE7YZ5RWOYQPIZ7AC

Fix bug 2298697: for dealing with weapons of returning which fail to return,

mons_throw() should have been using the mslot of the weapon, not weapon's mitm index.

Introduces the new functions get_mon_equip_slot() and item_to_mslot().

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

Created by zelgadis on November 21, 2008

MFP3WAGO2JIOT4QSEYPM4OJV5NVXMUOPL75OIE7YZ5RWOYQPIZ7AC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/mstuff2.cc at line 842 [4.1340842]
[2.2503]
[3.634]
```
    mon_inv_type slot = get_mon_equip_slot(monster, mitm[hand_used]);
```

Replacement in crawl-ref/source/mstuff2.cc at line 1208 [4.1340842]

B:BD[2.3730] → [2.3730:3802]

        monster->inv[returning ? hand_used : MSLOT_MISSILE] = NON_ITEM;

[2.3730]

[4.1374266]

        monster->inv[returning ? slot : MSLOT_MISSILE] = NON_ITEM;

Insertion in crawl-ref/source/mon-util.h at line 821 [4.1682293]
[5.9408]
[5.9408]
```
mon_inv_type item_to_mslot(const item_def &item);
```

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

[6.406]

mon_inv_type item_to_mslot(const item_def &item)
{
    switch(item.base_type)
    {
    case OBJ_WEAPONS:
		return MSLOT_WEAPON;
    case OBJ_MISSILES:
		return MSLOT_MISSILE;
    case OBJ_ARMOUR:
        return equip_slot_to_mslot(get_armour_slot(item));
    case OBJ_WANDS:
		return MSLOT_WAND;
    case OBJ_SCROLLS:
		return MSLOT_SCROLL;
    case OBJ_POTIONS:
		return MSLOT_POTION;
    case OBJ_MISCELLANY:
		return MSLOT_MISCELLANY;
    case OBJ_GOLD:
		return MSLOT_GOLD;
    default:
		return NUM_MONSTER_SLOTS;
    }
}

Replacement in crawl-ref/source/items.h at line 125 [4.2580284]

B:BD[7.342141] → [7.342141:342183]

int get_equip_slot(const item_def *item);

[7.342141]

[7.342183]

int          get_equip_slot(const item_def *item);
mon_inv_type get_mon_equip_slot(const monsters* mon, const item_def &item);

Insertion in crawl-ref/source/items.cc at line 2020 [4.2584728]

[7.356811]

}
mon_inv_type get_mon_equip_slot(const monsters* mon, const item_def &item)
{
    ASSERT(mon->alive());
    mon_inv_type slot = item_to_mslot(item);
    if (slot == NUM_MONSTER_SLOTS)
        return NUM_MONSTER_SLOTS;
	if (mon->mslot_item(slot) == &item)
        return slot;
    if (slot == MSLOT_WEAPON && mon->mslot_item(MSLOT_ALT_WEAPON) == &item)
        return MSLOT_ALT_WEAPON;
	return NUM_MONSTER_SLOTS;