Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-18 16:38:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Guild: Compile properly on *nix + fix so we don't delete the same item twice on disband (thanks shauren)

Browse Source 
--HG--
branch : trunk
This commit is contained in:
click
2010-08-21 10:31:46 +02:00
parent f7ad5b2624
commit d16656bb5d
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/server/game/Guilds/Guild.cpp
View File

@@ -59,7 +59,8 @@ Guild::Guild()
Guild::~Guild()
{
DeleteGuildBankItems(SQLTransaction(NULL));
SQLTransaction temp = SQLTransaction(NULL);
DeleteGuildBankItems(temp);
}
bool Guild::Create(Player* leader, std::string gname)
@@ -2356,7 +2357,7 @@ void Guild::DeleteGuildBankItems(SQLTransaction& trans, bool alsoInDB /*= false*
{
for (uint8 j = 0; j < GUILD_BANK_MAX_SLOTS; ++j)
{
if (Item* pItem = m_TabListMap[i]->Slots[j])
if (Item*& pItem = m_TabListMap[i]->Slots[j])
{
pItem->RemoveFromWorld();
@@ -2364,9 +2365,11 @@ void Guild::DeleteGuildBankItems(SQLTransaction& trans, bool alsoInDB /*= false*
pItem->DeleteFromDB(trans);
delete pItem;
pItem = NULL;
}
}
delete m_TabListMap[i];
m_TabListMap[i] = NULL;
}
m_TabListMap.clear();
}