Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 17:27:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

[8455] Do not disband guild, if guild ranks are not defined for that guild, removed obsolete comment.

Browse Source 
Do not allow to delete guild rank, when there are only 5 or less ranks defined.

    Signed-off-by: Triply <triply@getmangos.com>

--HG--
branch : trunk
This commit is contained in:
megamage
2009-09-02 18:40:27 -05:00
parent 4d94b923ef
commit 09974f0598
3 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/game/Guild.cpp
View File

@@ -299,7 +299,11 @@ bool Guild::LoadRanksFromDB(uint32 GuildId)
QueryResult *result = CharacterDatabase.PQuery("SELECT rid,rname,rights,BankMoneyPerDay FROM guild_rank WHERE guildid = '%u' ORDER BY rid ASC", GuildId);
if(!result)
return false;
{
sLog.outError("Guild %u has broken `guild_rank` data, creating new...",GuildId);
CreateDefaultGuildRanks(0);
return true;
}
bool broken_ranks = false;
@@ -343,7 +347,6 @@ bool Guild::LoadRanksFromDB(uint32 GuildId)
CharacterDatabase.PExecute("DELETE FROM guild_rank WHERE guildid='%u'", GuildId);
for(size_t i = 0; i < m_Ranks.size(); ++i)
{
// guild_rank.rid always store rank+1
std::string name = m_Ranks[i].name;
uint32 rights = m_Ranks[i].rights;
CharacterDatabase.escape_string(name);
@@ -643,7 +646,8 @@ void Guild::AddRank(const std::string& name_,uint32 rights, uint32 money)
void Guild::DelRank()
{
if(m_Ranks.empty())
// client won't allow to have less than GUILD_RANKS_MIN_COUNT ranks in guild
if(m_Ranks.size() <= GUILD_RANKS_MIN_COUNT)
return;
// delete lowest guild_rank