diff options
| author | Machiavelli <none@none> | 2010-08-21 03:44:02 +0200 |
|---|---|---|
| committer | Machiavelli <none@none> | 2010-08-21 03:44:02 +0200 |
| commit | 8cfc3782e3290539f56de57cfa1f9bb7bdf688e4 (patch) | |
| tree | 32c467731df01e0a7130a7b868ba4316369d9ad1 /src/server/game/Guilds | |
| parent | 994186f2672547761392c71ed15ded2a83e8c20d (diff) | |
Fix linux build (with PCH enabled, mind you)
--HG--
branch : trunk
Diffstat (limited to 'src/server/game/Guilds')
| -rw-r--r-- | src/server/game/Guilds/Guild.cpp | 6 | ||||
| -rw-r--r-- | src/server/game/Guilds/Guild.h | 2 |
2 files changed, 4 insertions, 4 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; |