[7804] Allow swap and move by bag slots equipped ammopouch and quiver Author: Foks

--HG-- branch : trunk
2009-05-10 14:30:04 -05:00
parent 40a8e6d3ab
commit 66c4b7b560
1 changed files with 9 additions and 6 deletions
@@ -9847,6 +9847,8 @@ uint8 Player::CanEquipItem( uint8 slot, uint16 &dest, Item *pItem, bool swap, bo
                for(int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i)
                {
                    if( Item* pBag = GetItemByPos( INVENTORY_SLOT_BAG_0, i ) )
+                    {
+                        if( pBag != pItem )
                        {
                            if( ItemPrototype const* pBagProto = pBag->GetProto() )
                            {
@@ -9861,6 +9863,7 @@ uint8 Player::CanEquipItem( uint8 slot, uint16 &dest, Item *pItem, bool swap, bo
                        }
                    }
                }
+            }

            uint32 type = pProto->InventoryType;