Skip to content

Commit

Permalink
Merge pull request #5714 from thomas33/master
Browse files Browse the repository at this point in the history 
more cleanup in files
  • Loading branch information
@Star-lion
Star-lion committed Mar 14, 2012
2 parents 69c3612 + 20cd4c7 commit fedb27b
Show file tree
Hide file tree
Showing 27 changed files with 804 additions and 804 deletions.
20 changes: 10 additions & 10 deletions src/server/game/AuctionHouse/AuctionHouseMgr.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ AuctionHouseObject* AuctionHouseMgr::GetAuctionsMap(uint32 factionTemplateId)
return &mNeutralAuctions;
}

uint32 AuctionHouseMgr::GetAuctionDeposit(AuctionHouseEntry const* entry, uint32 time, Item* pItem, uint32 count)
uint32 AuctionHouseMgr::GetAuctionDeposit(AuctionHouseEntry const* entry, uint32 time, Item* item, uint32 count)
{
uint32 MSV = pItem->GetTemplate()->SellPrice;
uint32 MSV = item->GetTemplate()->SellPrice;

if (MSV <= 0)
return AH_MINIMUM_DEPOSIT;
Expand All @@ -89,8 +89,8 @@ uint32 AuctionHouseMgr::GetAuctionDeposit(AuctionHouseEntry const* entry, uint32
//does not clear ram
void AuctionHouseMgr::SendAuctionWonMail(AuctionEntry* auction, SQLTransaction& trans)
{
Item* pItem = GetAItem(auction->item_guidlow);
if (!pItem)
Item* item = GetAItem(auction->item_guidlow);
if (!item)
return;

uint32 bidder_accId = 0;
Expand Down Expand Up @@ -127,7 +127,7 @@ void AuctionHouseMgr::SendAuctionWonMail(AuctionEntry* auction, SQLTransaction&
uint32 owner_accid = sObjectMgr->GetPlayerAccountIdByGUID(auction->owner);

sLog->outCommand(bidder_accId, "GM %s (Account: %u) won item in auction: %s (Entry: %u Count: %u) and pay money: %u. Original owner %s (Account: %u)",
bidder_name.c_str(), bidder_accId, pItem->GetTemplate()->Name1.c_str(), pItem->GetEntry(), pItem->GetCount(), auction->bid, owner_name.c_str(), owner_accid);
bidder_name.c_str(), bidder_accId, item->GetTemplate()->Name1.c_str(), item->GetEntry(), item->GetCount(), auction->bid, owner_name.c_str(), owner_accid);
}
}

Expand All @@ -147,7 +147,7 @@ void AuctionHouseMgr::SendAuctionWonMail(AuctionEntry* auction, SQLTransaction&
// owner in `data` will set at mail receive and item extracting
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_ITEM_OWNER);
stmt->setUInt32(0, auction->bidder);
stmt->setUInt32(1, pItem->GetGUIDLow());
stmt->setUInt32(1, item->GetGUIDLow());
trans->Append(stmt);

if (bidder)
Expand All @@ -158,7 +158,7 @@ void AuctionHouseMgr::SendAuctionWonMail(AuctionEntry* auction, SQLTransaction&
}

MailDraft(msgAuctionWonSubject.str(), msgAuctionWonBody.str())
.AddItem(pItem)
.AddItem(item)
.SendMailTo(trans, MailReceiver(bidder, auction->bidder), auction, MAIL_CHECK_MASK_COPIED);
}
}
Expand Down Expand Up @@ -234,8 +234,8 @@ void AuctionHouseMgr::SendAuctionSuccessfulMail(AuctionEntry* auction, SQLTransa
void AuctionHouseMgr::SendAuctionExpiredMail(AuctionEntry* auction, SQLTransaction& trans)
{
//return an item in auction to its owner by mail
Item* pItem = GetAItem(auction->item_guidlow);
if (!pItem)
Item* item = GetAItem(auction->item_guidlow);
if (!item)
return;

uint64 owner_guid = MAKE_NEW_GUID(auction->owner, 0, HIGHGUID_PLAYER);
Expand All @@ -251,7 +251,7 @@ void AuctionHouseMgr::SendAuctionExpiredMail(AuctionEntry* auction, SQLTransacti
owner->GetSession()->SendAuctionOwnerNotification(auction);

MailDraft(subject.str(), "") // TODO: fix body
.AddItem(pItem)
.AddItem(item)
.SendMailTo(trans, MailReceiver(owner, auction->owner), auction, MAIL_CHECK_MASK_COPIED, 0);
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/server/game/AuctionHouse/AuctionHouseMgr.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ class AuctionHouseMgr
void SendAuctionOutbiddedMail(AuctionEntry* auction, uint32 newPrice, Player* newBidder, SQLTransaction& trans);
void SendAuctionCancelledToBidderMail(AuctionEntry* auction, SQLTransaction& trans);

static uint32 GetAuctionDeposit(AuctionHouseEntry const* entry, uint32 time, Item* pItem, uint32 count);
static uint32 GetAuctionDeposit(AuctionHouseEntry const* entry, uint32 time, Item* item, uint32 count);
static AuctionHouseEntry const* GetAuctionHouseEntry(uint32 factionTemplateId);

public:
Expand Down
36 changes: 18 additions & 18 deletions src/server/game/Entities/Item/Container/Bag.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,18 +153,18 @@ void Bag::RemoveItem(uint8 slot, bool /*update*/)
SetUInt64Value(CONTAINER_FIELD_SLOT_1 + (slot * 2), 0);
}

void Bag::StoreItem(uint8 slot, Item* pItem, bool /*update*/)
void Bag::StoreItem(uint8 slot, Item* item, bool /*update*/)
{
ASSERT(slot < MAX_BAG_SIZE);

if (pItem && pItem->GetGUID() != this->GetGUID())
if (item && item->GetGUID() != this->GetGUID())
{
m_bagslot[slot] = pItem;
SetUInt64Value(CONTAINER_FIELD_SLOT_1 + (slot * 2), pItem->GetGUID());
pItem->SetUInt64Value(ITEM_FIELD_CONTAINED, GetGUID());
pItem->SetUInt64Value(ITEM_FIELD_OWNER, GetOwnerGUID());
pItem->SetContainer(this);
pItem->SetSlot(slot);
m_bagslot[slot] = item;
SetUInt64Value(CONTAINER_FIELD_SLOT_1 + (slot * 2), item->GetGUID());
item->SetUInt64Value(ITEM_FIELD_CONTAINED, GetGUID());
item->SetUInt64Value(ITEM_FIELD_OWNER, GetOwnerGUID());
item->SetContainer(this);
item->SetSlot(slot);
}
}

Expand All @@ -189,22 +189,22 @@ bool Bag::IsEmpty() const

uint32 Bag::GetItemCount(uint32 item, Item* eItem) const
{
Item* pItem;
Item* item;
uint32 count = 0;
for (uint32 i=0; i < GetBagSize(); ++i)
{
pItem = m_bagslot[i];
if (pItem && pItem != eItem && pItem->GetEntry() == item)
count += pItem->GetCount();
item = m_bagslot[i];
if (item && item != eItem && item->GetEntry() == item)
count += item->GetCount();
}

if (eItem && eItem->GetTemplate()->GemProperties)
{
for (uint32 i=0; i < GetBagSize(); ++i)
{
pItem = m_bagslot[i];
if (pItem && pItem != eItem && pItem->GetTemplate()->Socket[0].Color)
count += pItem->GetGemCountWithID(item);
item = m_bagslot[i];
if (item && item != eItem && item->GetTemplate()->Socket[0].Color)
count += item->GetGemCountWithID(item);
}
}

Expand All @@ -215,9 +215,9 @@ uint32 Bag::GetItemCountWithLimitCategory(uint32 limitCategory, Item* skipItem)
{
uint32 count = 0;
for (uint32 i = 0; i < GetBagSize(); ++i)
if (Item* pItem = m_bagslot[i])
if (pItem != skipItem)
if (ItemTemplate const* pProto = pItem->GetTemplate())
if (Item* item = m_bagslot[i])
if (item != skipItem)
if (ItemTemplate const* pProto = item->GetTemplate())
if (pProto->ItemLimitCategory == limitCategory)
count += m_bagslot[i]->GetCount();

Expand Down
2 changes: 1 addition & 1 deletion src/server/game/Entities/Item/Container/Bag.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class Bag : public Item
bool Create(uint32 guidlow, uint32 itemid, Player const* owner);

void Clear();
void StoreItem(uint8 slot, Item* pItem, bool update);
void StoreItem(uint8 slot, Item* item, bool update);
void RemoveItem(uint8 slot, bool update);

Item* GetItemByPos(uint8 slot) const;
Expand Down
10 changes: 5 additions & 5 deletions src/server/game/Entities/Item/Item.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1021,14 +1021,14 @@ Item* Item::CreateItem(uint32 item, uint32 count, Player const* player)

ASSERT(count !=0 && "pProto->Stackable == 0 but checked at loading already");

Item* pItem = NewItemOrBag(pProto);
if (pItem->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_ITEM), item, player))
Item* item = NewItemOrBag(pProto);
if (item->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_ITEM), item, player))
{
pItem->SetCount(count);
return pItem;
item->SetCount(count);
return item;
}
else
delete pItem;
delete item;
}
else
ASSERT(false);
Expand Down
Loading

0 comments on commit fedb27b

Please sign in to comment.