diff options
| -rw-r--r-- | src/server/game/Guilds/Guild.cpp | 6 | ||||
| -rw-r--r-- | src/server/game/Guilds/Guild.h | 2 | ||||
| -rw-r--r-- | src/server/game/Mails/Mail.cpp | 8 | ||||
| -rw-r--r-- | src/server/game/Mails/Mail.h | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp index 0617e66ef7b..db59a02dd78 100644 --- a/src/server/game/Guilds/Guild.cpp +++ b/src/server/game/Guilds/Guild.cpp @@ -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) { diff --git a/src/server/game/Guilds/Guild.h b/src/server/game/Guilds/Guild.h index fcf7429fbd1..093c7f8a670 100644 --- a/src/server/game/Guilds/Guild.h +++ b/src/server/game/Guilds/Guild.h @@ -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; diff --git a/src/server/game/Mails/Mail.cpp b/src/server/game/Mails/Mail.cpp index 00d82ca6860..8e43ed7756e 100644 --- a/src/server/game/Mails/Mail.cpp +++ b/src/server/game/Mails/Mail.cpp @@ -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)); } diff --git a/src/server/game/Mails/Mail.h b/src/server/game/Mails/Mail.h index 83a346d31c1..2af87229a49 100644 --- a/src/server/game/Mails/Mail.h +++ b/src/server/game/Mails/Mail.h @@ -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; |