diff options
| author | megamage <none@none> | 2009-02-22 17:35:14 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-02-22 17:35:14 -0600 |
| commit | 107218fe44c5a45023950f11ee3562abfcdd2c95 (patch) | |
| tree | 5a3aae5c74723b26cd016596199674af81fa1355 /src/game/Player.cpp | |
| parent | 7190332fcea1dcc6ed8ce59c6bfb542522775e35 (diff) | |
| parent | 90d5e05aafff0f3dabd294811b4f82b024317a4a (diff) | |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Player.cpp')
| -rw-r--r-- | src/game/Player.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 58a6924c874..f63bd1936a7 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -10252,8 +10252,7 @@ uint8 Player::CanEquipItem( uint8 slot, uint16 &dest, Item *pItem, bool swap, bo { if( ItemPrototype const* pBagProto = pBag->GetProto() ) { - if( pBagProto->Class==pProto->Class && pBagProto->SubClass==pProto->SubClass && - (!swap || pBag->GetSlot() != eslot ) ) + if( pBagProto->Class==pProto->Class && (!swap || pBag->GetSlot() != eslot ) ) { if(pBagProto->SubClass == ITEM_SUBCLASS_AMMO_POUCH) return EQUIP_ERR_CAN_EQUIP_ONLY1_AMMOPOUCH; |