josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*use ASSERT macro instead of regular assert for better output.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
QAston
2010-07-30 20:04:28 +02:00
parent 3dc29732b7
commit 48b360097c
50 changed files with 261 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Item/Container/Bag.cpp
+2 -2
View File
@@ -147,7 +147,7 @@ uint32 Bag::GetFreeSlots() const
void Bag::RemoveItem(uint8 slot, bool /*update*/)
{
assert(slot < MAX_BAG_SIZE);
ASSERT(slot < MAX_BAG_SIZE);
if (m_bagslot[slot])
m_bagslot[slot]->SetContainer(NULL);
@@ -158,7 +158,7 @@ void Bag::RemoveItem(uint8 slot, bool /*update*/)
void Bag::StoreItem(uint8 slot, Item *pItem, bool /*update*/)
{
assert(slot < MAX_BAG_SIZE);
ASSERT(slot < MAX_BAG_SIZE);
if (pItem && pItem->GetGUID() != this->GetGUID())
{
src/server/game/Entities/Item/Item.cpp
+3 -3
View File
@@ -165,7 +165,7 @@ void RemoveItemsSetItem(Player*player,ItemPrototype const *proto)
if (!eff->item_count) //all items of a set were removed
{
assert(eff == player->ItemSetEff[setindex]);
ASSERT(eff == player->ItemSetEff[setindex]);
delete eff;
player->ItemSetEff[setindex] = NULL;
}
@@ -1031,7 +1031,7 @@ Item* Item::CreateItem(uint32 item, uint32 count, Player const* player)
if (count > pProto->GetMaxStackSize())
count = pProto->GetMaxStackSize();
assert(count !=0 && "pProto->Stackable == 0 but checked at loading already");
ASSERT(count !=0 && "pProto->Stackable == 0 but checked at loading already");
Item *pItem = NewItemOrBag(pProto);
if (pItem->Create(objmgr.GenerateLowGuid(HIGHGUID_ITEM), item, player))
@@ -1043,7 +1043,7 @@ Item* Item::CreateItem(uint32 item, uint32 count, Player const* player)
delete pItem;
}
else
assert(false);
ASSERT(false);
return NULL;
}