mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-17 16:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[8410] Fixed guild bank loading broken by previous commit.

Browse source 
Signed-off-by: Triply <triply@getmangos.com>
This commit is contained in:
Triply 2009-08-23 18:52:14 +02:00
parent efa24ced49
commit 8aef9ce5e9
2 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/game/Guild.cpp
View file

@ -212,7 +212,15 @@ bool Guild::LoadGuildFromDB(uint32 GuildId)
//set m_Id in case guild data are broken in DB and Guild will be Disbanded (deleted from DB) //set m_Id in case guild data are broken in DB and Guild will be Disbanded (deleted from DB)
m_Id = GuildId; m_Id = GuildId;
//variable m_PurchasedTabs is loaded when guild bank is loaded, because we don't need it yet QueryResult *result = CharacterDatabase.PQuery("SELECT COUNT(TabId) FROM guild_bank_tab WHERE guildid='%u'", GuildId);
if(result)
{
Field *fields = result->Fetch();
m_PurchasedTabs = fields[0].GetUInt32();
if (m_PurchasedTabs > GUILD_BANK_MAX_TABS)
m_PurchasedTabs = GUILD_BANK_MAX_TABS;
delete result;
}
if(!LoadRanksFromDB(GuildId)) if(!LoadRanksFromDB(GuildId))
return false; return false;
@ -223,7 +231,7 @@ bool Guild::LoadGuildFromDB(uint32 GuildId)
LoadBankRightsFromDB(GuildId); // Must be after LoadRanksFromDB because it populates rank struct LoadBankRightsFromDB(GuildId); // Must be after LoadRanksFromDB because it populates rank struct
// 0 1 2 3 4 5 // 0 1 2 3 4 5
QueryResult *result = CharacterDatabase.PQuery("SELECT name, leaderguid, EmblemStyle, EmblemColor, BorderStyle, BorderColor," result = CharacterDatabase.PQuery("SELECT name, leaderguid, EmblemStyle, EmblemColor, BorderStyle, BorderColor,"
// 6 7 8 9 10 // 6 7 8 9 10
"BackgroundColor, info, motd, createdate, BankMoney FROM guild WHERE guildid = '%u'", GuildId); "BackgroundColor, info, motd, createdate, BankMoney FROM guild WHERE guildid = '%u'", GuildId);

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "8409" #define REVISION_NR "8410"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__