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

Fix linux build (with PCH enabled, mind you)

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Machiavelli
2010-08-21 03:44:02 +02:00
parent 994186f267
commit 8cfc3782e3
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,7 +59,7 @@ Guild::Guild()
Guild::~Guild()
{
DeleteGuildBankItems();
DeleteGuildBankItems(SQLTransaction(NULL));
}
bool Guild::Create(Player* leader, std::string gname)
@@ -716,7 +716,7 @@ void Guild::Disband()
trans->PAppend("DELETE FROM guild_bank_tab WHERE guildid = '%u'", m_Id);
//Free bank tab used memory and delete items stored in them
DeleteGuildBankItems(true);
DeleteGuildBankItems(trans, true);
trans->PAppend("DELETE FROM guild_bank_item WHERE guildid = '%u'", m_Id);
trans->PAppend("DELETE FROM guild_bank_right WHERE guildid = '%u'", m_Id);
@@ -2350,7 +2350,7 @@ void Guild::BroadcastEvent(GuildEvents event, uint64 guid, uint8 strCount, std::
sLog.outDebug("WORLD: Sent SMSG_GUILD_EVENT");
}
void Guild::DeleteGuildBankItems( bool alsoInDB /*= false*/, SQLTransaction& trans)
void Guild::DeleteGuildBankItems(SQLTransaction& trans, bool alsoInDB /*= false*/)
{
for (size_t i = 0; i < m_TabListMap.size(); ++i)
{

2
src/server/game/Guilds/Guild.h
View File

@@ -294,7 +294,7 @@ class Guild
void CreateDefaultGuildRanks(int locale_idx);
void Disband();
void DeleteGuildBankItems(bool alsoInDB = false, SQLTransaction& trans = SQLTransaction(NULL));
void DeleteGuildBankItems(SQLTransaction& trans, bool alsoInDB = false);
typedef std::map<uint32, MemberSlot> MemberList;
typedef std::vector<RankInfo> RankList;

8
src/server/game/Mails/Mail.cpp
View File

@@ -852,7 +852,7 @@ void MailDraft::prepareItems(Player* receiver, SQLTransaction& trans)
}
}
void MailDraft::deleteIncludedItems(bool inDB /*= false*/, SQLTransaction& trans)
void MailDraft::deleteIncludedItems(SQLTransaction& trans, bool inDB /*= false*/ )
{
for (MailItemMap::iterator mailItemIter = m_items.begin(); mailItemIter != m_items.end(); ++mailItemIter)
{
@@ -879,7 +879,7 @@ void MailDraft::SendReturnToSender(uint32 sender_acc, uint32 sender_guid, uint32
if (!receiver && !rc_account) // sender not exist
{
deleteIncludedItems(true, trans);
deleteIncludedItems(trans, true);
return;
}
@@ -991,8 +991,8 @@ void MailDraft::SendMailTo(SQLTransaction& trans, MailReceiver const& receiver,
}
}
else if (!m_items.empty())
deleteIncludedItems();
deleteIncludedItems(SQLTransaction(NULL));
}
else if (!m_items.empty())
deleteIncludedItems();
deleteIncludedItems(SQLTransaction(NULL));
}

2
src/server/game/Mails/Mail.h
View File

@@ -139,7 +139,7 @@ class MailDraft
void SendMailTo(SQLTransaction& trans, MailReceiver const& receiver, MailSender const& sender, MailCheckMask checked = MAIL_CHECK_MASK_NONE, uint32 deliver_delay = 0);
private:
void deleteIncludedItems(bool inDB = false, SQLTransaction& trans = SQLTransaction(NULL));
void deleteIncludedItems(SQLTransaction& trans, bool inDB = false);
void prepareItems(Player* receiver, SQLTransaction& trans); // called from SendMailTo for generate mailTemplateBase items
uint16 m_mailTemplateId;