mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-14 16:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[6909] Correctly equip all possible amount non stackable items from custom initial items with >1 amount instead equip single and ignore other.

Browse source 
Also corrently report error at buy to equip slot not single item (impossible using normal client way)
instead silencely ingnore amount and equip single by stack price.
This commit is contained in:
VladimirMangos 2008-12-15 03:08:01 +03:00
parent a62801aee9
commit a89080730d
3 changed files with 33 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/game/Player.cpp
View file

@ -668,12 +668,12 @@ bool Player::Create( uint32 guidlow, const std::string& name, uint8 race, uint8
} }
} }
StoreNewItemInBestSlot(item_id, count); StoreNewItemInBestSlots(item_id, count);
} }
} }
for (PlayerCreateInfoItems::const_iterator item_id_itr = info->item.begin(); item_id_itr!=info->item.end(); ++item_id_itr++) for (PlayerCreateInfoItems::const_iterator item_id_itr = info->item.begin(); item_id_itr!=info->item.end(); ++item_id_itr++)
StoreNewItemInBestSlot(item_id_itr->item_id, item_id_itr->item_amount); StoreNewItemInBestSlots(item_id_itr->item_id, item_id_itr->item_amount);
// bags and main-hand weapon must equipped at this moment // bags and main-hand weapon must equipped at this moment
// now second pass for not equipped (offhand weapon/shield if it attempt equipped before main-hand weapon) // now second pass for not equipped (offhand weapon/shield if it attempt equipped before main-hand weapon)
@ -713,24 +713,30 @@ bool Player::Create( uint32 guidlow, const std::string& name, uint8 race, uint8
return true; return true;
} }
bool Player::StoreNewItemInBestSlot(uint32 titem_id, uint32 titem_amount) bool Player::StoreNewItemInBestSlots(uint32 titem_id, uint32 titem_amount)
{ {
sLog.outDebug("STORAGE: Creating initial item, itemId = %u, count = %u",titem_id, titem_amount); sLog.outDebug("STORAGE: Creating initial item, itemId = %u, count = %u",titem_id, titem_amount);
// attempt equip // attempt equip by one
uint16 eDest; while(titem_amount > 0)
uint8 msg = CanEquipNewItem( NULL_SLOT, eDest, titem_id, titem_amount, false );
if( msg == EQUIP_ERR_OK )
{ {
EquipNewItem( eDest, titem_id, titem_amount, true); uint16 eDest;
uint8 msg = CanEquipNewItem( NULL_SLOT, eDest, titem_id, false );
if( msg != EQUIP_ERR_OK )
break;
EquipNewItem( eDest, titem_id, true);
AutoUnequipOffhandIfNeed(); AutoUnequipOffhandIfNeed();
return true; // equipped --titem_amount;
} }
if(titem_amount == 0)
return true; // equipped
// attempt store // attempt store
ItemPosCountVec sDest; ItemPosCountVec sDest;
// store in main bag to simplify second pass (special bags can be not equipped yet at this moment) // store in main bag to simplify second pass (special bags can be not equipped yet at this moment)
msg = CanStoreNewItem( INVENTORY_SLOT_BAG_0, NULL_SLOT, sDest, titem_id, titem_amount ); uint8 msg = CanStoreNewItem( INVENTORY_SLOT_BAG_0, NULL_SLOT, sDest, titem_id, titem_amount );
if( msg == EQUIP_ERR_OK ) if( msg == EQUIP_ERR_OK )
{ {
StoreNewItem( sDest, titem_id, true, Item::GenerateItemRandomPropertyId(titem_id) ); StoreNewItem( sDest, titem_id, true, Item::GenerateItemRandomPropertyId(titem_id) );
@ -9307,10 +9313,10 @@ uint8 Player::CanStoreItems( Item **pItems,int count) const
} }
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
uint8 Player::CanEquipNewItem( uint8 slot, uint16 &dest, uint32 item, uint32 count, bool swap ) const uint8 Player::CanEquipNewItem( uint8 slot, uint16 &dest, uint32 item, bool swap ) const
{ {
dest = 0; dest = 0;
Item *pItem = Item::CreateItem( item, count, this ); Item *pItem = Item::CreateItem( item, 1, this );
if( pItem ) if( pItem )
{ {
uint8 result = CanEquipItem(slot, dest, pItem, swap ); uint8 result = CanEquipItem(slot, dest, pItem, swap );
@ -9974,12 +9980,12 @@ Item* Player::_StoreItem( uint16 pos, Item *pItem, uint32 count, bool clone, boo
} }
} }
Item* Player::EquipNewItem( uint16 pos, uint32 item, uint32 count, bool update ) Item* Player::EquipNewItem( uint16 pos, uint32 item, bool update )
{ {
Item *pItem = Item::CreateItem( item, count, this ); Item *pItem = Item::CreateItem( item, 1, this );
if( pItem ) if( pItem )
{ {
ItemAddedQuestCheck( item, count ); ItemAddedQuestCheck( item, 1 );
Item * retItem = EquipItem( pos, pItem, update ); Item * retItem = EquipItem( pos, pItem, update );
return retItem; return retItem;
@ -16636,8 +16642,14 @@ bool Player::BuyItemFromVendor(uint64 vendorguid, uint32 item, uint8 count, uint
} }
else if( IsEquipmentPos( bag, slot ) ) else if( IsEquipmentPos( bag, slot ) )
{ {
if(pProto->BuyCount * count != 1)
{
SendEquipError( EQUIP_ERR_ITEM_CANT_BE_EQUIPPED, NULL, NULL );
return false;
}
uint16 dest; uint16 dest;
uint8 msg = CanEquipNewItem( slot, dest, item, pProto->BuyCount * count, false ); uint8 msg = CanEquipNewItem( slot, dest, item, false );
if( msg != EQUIP_ERR_OK ) if( msg != EQUIP_ERR_OK )
{ {
SendEquipError( msg, NULL, NULL ); SendEquipError( msg, NULL, NULL );
@ -16659,7 +16671,7 @@ bool Player::BuyItemFromVendor(uint64 vendorguid, uint32 item, uint8 count, uint
} }
} }
if(Item *it = EquipNewItem( dest, item, pProto->BuyCount * count, true )) if(Item *it = EquipNewItem( dest, item, true ))
{ {
uint32 new_count = pCreature->UpdateVendorItemCurrentCount(crItem,pProto->BuyCount * count); uint32 new_count = pCreature->UpdateVendorItemCurrentCount(crItem,pProto->BuyCount * count);

6
src/game/Player.h
View file

@ -1053,7 +1053,7 @@ class MANGOS_DLL_SPEC Player : public Unit
} }
uint8 CanStoreItems( Item **pItem,int count) const; uint8 CanStoreItems( Item **pItem,int count) const;
uint8 CanEquipNewItem( uint8 slot, uint16 &dest, uint32 item, uint32 count, bool swap ) const; uint8 CanEquipNewItem( uint8 slot, uint16 &dest, uint32 item, bool swap ) const;
uint8 CanEquipItem( uint8 slot, uint16 &dest, Item *pItem, bool swap, bool not_loading = true ) const; uint8 CanEquipItem( uint8 slot, uint16 &dest, Item *pItem, bool swap, bool not_loading = true ) const;
uint8 CanUnequipItems( uint32 item, uint32 count ) const; uint8 CanUnequipItems( uint32 item, uint32 count ) const;
uint8 CanUnequipItem( uint16 src, bool swap ) const; uint8 CanUnequipItem( uint16 src, bool swap ) const;
@ -1064,10 +1064,10 @@ class MANGOS_DLL_SPEC Player : public Unit
uint8 CanUseAmmo( uint32 item ) const; uint8 CanUseAmmo( uint32 item ) const;
Item* StoreNewItem( ItemPosCountVec const& pos, uint32 item, bool update,int32 randomPropertyId = 0 ); Item* StoreNewItem( ItemPosCountVec const& pos, uint32 item, bool update,int32 randomPropertyId = 0 );
Item* StoreItem( ItemPosCountVec const& pos, Item *pItem, bool update ); Item* StoreItem( ItemPosCountVec const& pos, Item *pItem, bool update );
Item* EquipNewItem( uint16 pos, uint32 item, uint32 count, bool update ); Item* EquipNewItem( uint16 pos, uint32 item, bool update );
Item* EquipItem( uint16 pos, Item *pItem, bool update ); Item* EquipItem( uint16 pos, Item *pItem, bool update );
void AutoUnequipOffhandIfNeed(); void AutoUnequipOffhandIfNeed();
bool StoreNewItemInBestSlot(uint32 item_id, uint32 item_count); bool StoreNewItemInBestSlots(uint32 item_id, uint32 item_count);
uint8 _CanTakeMoreSimilarItems(uint32 entry, uint32 count, Item* pItem, uint32* no_space_count = NULL) const; uint8 _CanTakeMoreSimilarItems(uint32 entry, uint32 count, Item* pItem, uint32* no_space_count = NULL) const;
uint8 _CanStoreItem( uint8 bag, uint8 slot, ItemPosCountVec& dest, uint32 entry, uint32 count, Item *pItem = NULL, bool swap = false, uint32* no_space_count = NULL ) const; uint8 _CanStoreItem( uint8 bag, uint8 slot, ItemPosCountVec& dest, uint32 entry, uint32 count, Item *pItem = NULL, bool swap = false, uint32* no_space_count = NULL ) const;

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "6908" #define REVISION_NR "6909"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__