From 7204f83a558b3d6e98d68680e0285862b18da480 Mon Sep 17 00:00:00 2001 From: Foks Date: Sat, 9 May 2009 15:06:28 +0400 Subject: [PATCH] [7804] Allow swap and move by bag slots equipped ammopouch and quiver Signed-off-by: VladimirMangos --- src/game/Player.cpp | 15 +++++++++------ src/shared/revision_nr.h | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 818694f60..f129320df 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -9570,14 +9570,17 @@ uint8 Player::CanEquipItem( uint8 slot, uint16 &dest, Item *pItem, bool swap, bo { if( Item* pBag = GetItemByPos( INVENTORY_SLOT_BAG_0, i ) ) { - if( ItemPrototype const* pBagProto = pBag->GetProto() ) + if( pBag != pItem ) { - if( pBagProto->Class==pProto->Class && (!swap || pBag->GetSlot() != eslot ) ) + if( ItemPrototype const* pBagProto = pBag->GetProto() ) { - if(pBagProto->SubClass == ITEM_SUBCLASS_AMMO_POUCH) - return EQUIP_ERR_CAN_EQUIP_ONLY1_AMMOPOUCH; - else - return EQUIP_ERR_CAN_EQUIP_ONLY1_QUIVER; + if( pBagProto->Class==pProto->Class && (!swap || pBag->GetSlot() != eslot ) ) + { + if(pBagProto->SubClass == ITEM_SUBCLASS_AMMO_POUCH) + return EQUIP_ERR_CAN_EQUIP_ONLY1_AMMOPOUCH; + else + return EQUIP_ERR_CAN_EQUIP_ONLY1_QUIVER; + } } } } diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 64e83df23..cdecaf091 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "7803" + #define REVISION_NR "7804" #endif // __REVISION_NR_H__