aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Guilds/Guild.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/game/Guilds/Guild.cpp')
-rw-r--r--src/server/game/Guilds/Guild.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp
index 6de90abd781..426164a0718 100644
--- a/src/server/game/Guilds/Guild.cpp
+++ b/src/server/game/Guilds/Guild.cpp
@@ -480,7 +480,7 @@ bool Guild::BankTab::SetItem(SQLTransaction& trans, uint8 slotId, Item* item)
stmt->setUInt64(3, item->GetGUID().GetCounter());
trans->Append(stmt);
- item->SetGuidValue(ITEM_FIELD_CONTAINED, ObjectGuid::Empty);
+ item->SetContainedIn(ObjectGuid::Empty);
item->SetOwnerGUID(ObjectGuid::Empty);
item->FSetState(ITEM_NEW);
item->SaveToDB(trans); // Not in inventory and can be saved standalone
@@ -535,7 +535,7 @@ void Guild::Member::SetStats(Player* player)
m_name = player->GetName();
m_level = player->getLevel();
m_class = player->getClass();
- _gender = player->GetByteValue(PLAYER_BYTES_3, PLAYER_BYTES_3_OFFSET_GENDER);
+ _gender = player->m_playerData->NativeSex;
m_zoneId = player->GetZoneId();
m_accountId = player->GetSession()->GetAccountId();
m_achievementPoints = player->GetAchievementPoints();
@@ -3312,9 +3312,9 @@ void Guild::_SendBankContentUpdate(uint8 tabId, SlotIds slots) const
if (tabItem)
{
uint8 i = 0;
- for (ItemDynamicFieldGems const& gemData : tabItem->GetGems())
+ for (UF::SocketedGem const& gemData : tabItem->m_itemData->Gems)
{
- if (gemData.ItemId)
+ if (gemData.ItemID)
{
WorldPackets::Item::ItemGemData gem;
gem.Slot = i;
@@ -3389,14 +3389,14 @@ void Guild::SendBankList(WorldSession* session, uint8 tabId, bool fullUpdate) co
itemInfo.Item.ItemID = tabItem->GetEntry();
itemInfo.Count = int32(tabItem->GetCount());
itemInfo.Charges = int32(abs(tabItem->GetSpellCharges()));
- itemInfo.EnchantmentID = int32(tabItem->GetItemRandomPropertyId()); // verify that...
- itemInfo.OnUseEnchantmentID = 0/*int32(tabItem->GetItemSuffixFactor())*/;
+ itemInfo.EnchantmentID = int32(tabItem->GetEnchantmentId(PERM_ENCHANTMENT_SLOT));
+ itemInfo.OnUseEnchantmentID = int32(tabItem->GetEnchantmentId(USE_ENCHANTMENT_SLOT));
itemInfo.Flags = 0;
uint8 i = 0;
- for (ItemDynamicFieldGems const& gemData : tabItem->GetGems())
+ for (UF::SocketedGem const& gemData : tabItem->m_itemData->Gems)
{
- if (gemData.ItemId)
+ if (gemData.ItemID)
{
WorldPackets::Item::ItemGemData gem;
gem.Slot = i;