mirror of
https://github.com/mangosfour/server.git
synced 2025-12-18 19:37:01 +00:00
Apply style fix
This commit is contained in:
Antz
parent
5531a0087d
commit
35405dd549
155 changed files with 10968 additions and 3660 deletions
|
|
@ -79,7 +79,9 @@ void MemberSlot::ChangeRank(uint32 newRank)
|
|||
Player* player = sObjectMgr.GetPlayer(guid);
|
||||
// If player not online data in data field will be loaded from guild tabs no need to update it !!
|
||||
if (player)
|
||||
{ player->SetRank(newRank); }
|
||||
{
|
||||
player->SetRank(newRank);
|
||||
}
|
||||
|
||||
CharacterDatabase.PExecute("UPDATE guild_member SET rank='%u' WHERE guid='%u'", newRank, guid.GetCounter());
|
||||
}
|
||||
|
|
@ -117,11 +119,15 @@ Guild::~Guild()
|
|||
bool Guild::Create(Player* leader, std::string gname)
|
||||
{
|
||||
if (sGuildMgr.GetGuildByName(gname))
|
||||
{ return false; }
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
WorldSession* lSession = leader->GetSession();
|
||||
if (!lSession)
|
||||
{ return false; }
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
m_LeaderGuid = leader->GetObjectGuid();
|
||||
m_Name = gname;
|
||||
|
|
@ -179,12 +185,16 @@ bool Guild::AddMember(ObjectGuid plGuid, uint32 plRank)
|
|||
if (pl)
|
||||
{
|
||||
if (pl->GetGuildId() != 0)
|
||||
{ return false; }
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (Player::GetGuildIdFromDB(plGuid) != 0) // player already in guild
|
||||
{ return false; }
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
// remove all player signs from another petitions
|
||||
|
|
@ -296,7 +306,9 @@ void Guild::SetGINFO(std::string ginfo)
|
|||
bool Guild::LoadGuildFromDB(QueryResult* guildDataResult)
|
||||
{
|
||||
if (!guildDataResult)
|
||||
{ return false; }
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
Field* fields = guildDataResult->Fetch();
|
||||
|
||||
|
|
@ -345,7 +357,9 @@ bool Guild::CheckGuildStructure()
|
|||
{
|
||||
MemberSlot &member = itr->second;
|
||||
if (member.RankId == GR_GUILDMASTER && m_LeaderGuid != member.guid)
|
||||
{ member.ChangeRank(GR_OFFICER); }
|
||||
{
|
||||
member.ChangeRank(GR_OFFICER);
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
|
|
@ -373,7 +387,9 @@ bool Guild::LoadRanksFromDB(QueryResult* guildRanksResult)
|
|||
fields = guildRanksResult->Fetch();
|
||||
// condition that would be true when all ranks in QueryResult will be processed and guild without ranks is being processed
|
||||
if (!fields)
|
||||
{ break; }
|
||||
{
|
||||
break;
|
||||
}
|
||||
|
||||
uint32 guildId = fields[0].GetUInt32();
|
||||
if (guildId < m_Id)
|
||||
|
|
@ -385,7 +401,9 @@ bool Guild::LoadRanksFromDB(QueryResult* guildRanksResult)
|
|||
}
|
||||
|
||||
if (guildId > m_Id) // we loaded all ranks for this guild already, break cycle
|
||||
{ break; }
|
||||
{
|
||||
break;
|
||||
}
|
||||
|
||||
uint32 rankID = fields[1].GetUInt32();
|
||||
std::string rankName = fields[2].GetCppString();
|
||||
|
|
@ -393,11 +411,15 @@ bool Guild::LoadRanksFromDB(QueryResult* guildRanksResult)
|
|||
uint32 rankMoney = fields[4].GetUInt32();
|
||||
|
||||
if (rankID != m_Ranks.size()) // guild_rank.ids are sequence 0,1,2,3..
|
||||
{ broken_ranks = true; }
|
||||
{
|
||||
broken_ranks = true;
|
||||
}
|
||||
|
||||
// first rank is guildmaster, prevent loss leader rights
|
||||
if (m_Ranks.empty())
|
||||
{ rankRights |= GR_RIGHT_ALL; }
|
||||
{
|
||||
rankRights |= GR_RIGHT_ALL;
|
||||
}
|
||||
|
||||
AddRank(rankName, rankRights, rankMoney);
|
||||
}
|
||||
|
|
@ -432,14 +454,18 @@ bool Guild::LoadRanksFromDB(QueryResult* guildRanksResult)
|
|||
bool Guild::LoadMembersFromDB(QueryResult* guildMembersResult)
|
||||
{
|
||||
if (!guildMembersResult)
|
||||
{ return false; }
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
do
|
||||
{
|
||||
Field* fields = guildMembersResult->Fetch();
|
||||
// this condition will be true when all rows in QueryResult are processed and new guild without members is going to be loaded - prevent crash
|
||||
if (!fields)
|
||||
{ break; }
|
||||
{
|
||||
break;
|
||||
}
|
||||
uint32 guildId = fields[0].GetUInt32();
|
||||
if (guildId < m_Id)
|
||||
{
|
||||
|
|
@ -459,7 +485,9 @@ bool Guild::LoadMembersFromDB(QueryResult* guildMembersResult)
|
|||
newmember.RankId = fields[2].GetUInt32();
|
||||
// don't allow member to have not existing rank!
|
||||
if (newmember.RankId >= m_Ranks.size())
|
||||
{ newmember.RankId = GetLowestRank(); }
|
||||
{
|
||||
newmember.RankId = GetLowestRank();
|
||||
}
|
||||
|
||||
newmember.Pnote = fields[3].GetCppString();
|
||||
newmember.OFFnote = fields[4].GetCppString();
|
||||
|
|
@ -504,7 +532,9 @@ bool Guild::LoadMembersFromDB(QueryResult* guildMembersResult)
|
|||
while (guildMembersResult->NextRow());
|
||||
|
||||
if (members.empty())
|
||||
{ return false; }
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
UpdateAccountsNumber();
|
||||
|
||||
|
|
@ -515,7 +545,9 @@ void Guild::SetLeader(ObjectGuid guid)
|
|||
{
|
||||
MemberSlot* slot = GetMemberSlot(guid);
|
||||
if (!slot)
|
||||
{ return; }
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
m_LeaderGuid = guid;
|
||||
slot->ChangeRank(GR_GUILDMASTER);
|
||||
|
|
@ -558,13 +590,17 @@ bool Guild::DelMember(ObjectGuid guid, bool isDisbanding)
|
|||
}
|
||||
|
||||
if (!best)
|
||||
{ return true; }
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
SetLeader(newLeaderGUID);
|
||||
|
||||
// If player not online data in data field will be loaded from guild tabs no need to update it !!
|
||||
if (Player* newLeader = sObjectMgr.GetPlayer(newLeaderGUID))
|
||||
{ newLeader->SetRank(GR_GUILDMASTER); }
|
||||
{
|
||||
newLeader->SetRank(GR_GUILDMASTER);
|
||||
}
|
||||
|
||||
// when leader non-exist (at guild load with deleted leader only) not send broadcasts
|
||||
if (oldLeader)
|
||||
|
|
@ -588,7 +624,9 @@ bool Guild::DelMember(ObjectGuid guid, bool isDisbanding)
|
|||
CharacterDatabase.PExecute("DELETE FROM guild_member WHERE guid = '%u'", lowguid);
|
||||
|
||||
if (!isDisbanding)
|
||||
{ UpdateAccountsNumber(); }
|
||||
{
|
||||
UpdateAccountsNumber();
|
||||
}
|
||||
|
||||
// Used by Eluna
|
||||
#ifdef ENABLE_ELUNA
|
||||
|
|
@ -612,11 +650,15 @@ bool Guild::ChangeMemberRank(ObjectGuid guid, uint8 newRank)
|
|||
void Guild::BroadcastToGuild(WorldSession* session, const std::string& msg, uint32 language)
|
||||
{
|
||||
if (!session)
|
||||
{ return; }
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
Player* player = session->GetPlayer();
|
||||
if (!player || !HasRankRight(player->GetRank(), GR_RIGHT_GCHATSPEAK))
|
||||
{ return; }
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
WorldPacket data;
|
||||
ChatHandler::BuildChatPacket(data, CHAT_MSG_GUILD, msg.c_str(), Language(language), player->GetChatTag(), player->GetObjectGuid(), player->GetName());
|
||||
|
|
@ -626,7 +668,9 @@ void Guild::BroadcastToGuild(WorldSession* session, const std::string& msg, uint
|
|||
Player* pl = ObjectAccessor::FindPlayer(ObjectGuid(HIGHGUID_PLAYER, itr->first));
|
||||
|
||||
if (pl && pl->GetSession() && HasRankRight(pl->GetRank(), GR_RIGHT_GCHATLISTEN) && !pl->GetSocial()->HasIgnore(player->GetObjectGuid()))
|
||||
{ pl->GetSession()->SendPacket(&data); }
|
||||
{
|
||||
pl->GetSession()->SendPacket(&data);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -650,11 +694,15 @@ void Guild::BroadcastAddonToGuild(WorldSession* session, const std::string& msg,
|
|||
void Guild::BroadcastToOfficers(WorldSession* session, const std::string& msg, uint32 language)
|
||||
{
|
||||
if (!session)
|
||||
{ return; }
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
Player* player = session->GetPlayer();
|
||||
if (!player || !HasRankRight(player->GetRank(), GR_RIGHT_OFFCHATSPEAK))
|
||||
{ return; }
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
for (MemberList::const_iterator itr = members.begin(); itr != members.end(); ++itr)
|
||||
{
|
||||
|
|
@ -691,7 +739,9 @@ void Guild::BroadcastPacket(WorldPacket* packet)
|
|||
{
|
||||
Player* player = ObjectAccessor::FindPlayer(ObjectGuid(HIGHGUID_PLAYER, itr->first));
|
||||
if (player)
|
||||
{ player->GetSession()->SendPacket(packet); }
|
||||
{
|
||||
player->GetSession()->SendPacket(packet);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -703,7 +753,9 @@ void Guild::BroadcastPacketToRank(WorldPacket* packet, uint32 rankId)
|
|||
{
|
||||
Player* player = ObjectAccessor::FindPlayer(ObjectGuid(HIGHGUID_PLAYER, itr->first));
|
||||
if (player)
|
||||
{ player->GetSession()->SendPacket(packet); }
|
||||
{
|
||||
player->GetSession()->SendPacket(packet);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -744,7 +796,9 @@ void Guild::MassInviteToEvent(WorldSession* session, uint32 minLevel, uint32 max
|
|||
void Guild::CreateRank(std::string name_, uint32 rights)
|
||||
{
|
||||
if (m_Ranks.size() >= GUILD_RANKS_MAX_COUNT)
|
||||
{ return; }
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// ranks are sequence 0,1,2,... where 0 means guildmaster
|
||||
uint32 new_rank_id = m_Ranks.size();
|
||||
|
|
@ -775,7 +829,9 @@ void Guild::DelRank(uint32 rankId)
|
|||
|
||||
// client won't allow to have less than GUILD_RANKS_MIN_COUNT ranks in guild
|
||||
if (m_Ranks.size() <= GUILD_RANKS_MIN_COUNT || rankId < GUILD_RANKS_MIN_COUNT)
|
||||
{ return; }
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
RankList::iterator itr = m_Ranks.erase(m_Ranks.begin() + rankId);
|
||||
// delete lowest guild_rank
|
||||
|
|
@ -826,7 +882,9 @@ void Guild::SwitchRank(uint32 rankId, bool up)
|
|||
std::string Guild::GetRankName(uint32 rankId)
|
||||
{
|
||||
if (rankId >= m_Ranks.size())
|
||||
{ return "<unknown>"; }
|
||||
{
|
||||
return "<unknown>";
|
||||
}
|
||||
|
||||
return m_Ranks[rankId].Name;
|
||||
}
|
||||
|
|
@ -834,7 +892,9 @@ std::string Guild::GetRankName(uint32 rankId)
|
|||
uint32 Guild::GetRankRights(uint32 rankId)
|
||||
{
|
||||
if (rankId >= m_Ranks.size())
|
||||
{ return 0; }
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
return m_Ranks[rankId].Rights;
|
||||
}
|
||||
|
|
@ -842,7 +902,9 @@ uint32 Guild::GetRankRights(uint32 rankId)
|
|||
void Guild::SetRankName(uint32 rankId, std::string name_)
|
||||
{
|
||||
if (rankId >= m_Ranks.size())
|
||||
{ return; }
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
m_Ranks[rankId].Name = name_;
|
||||
|
||||
|
|
@ -854,7 +916,9 @@ void Guild::SetRankName(uint32 rankId, std::string name_)
|
|||
void Guild::SetRankRights(uint32 rankId, uint32 rights)
|
||||
{
|
||||
if (rankId >= m_Ranks.size())
|
||||
{ return; }
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
m_Ranks[rankId].Rights = rights;
|
||||
|
||||
|
|
@ -980,7 +1044,9 @@ void Guild::Roster(WorldSession* session /*= NULL*/)
|
|||
data << uint32(0);
|
||||
|
||||
if (session)
|
||||
{ session->SendPacket(&data); }
|
||||
{
|
||||
session->SendPacket(&data);
|
||||
}
|
||||
else
|
||||
{ BroadcastPacket(&data); }
|
||||
DEBUG_LOG("WORLD: Sent (SMSG_GUILD_ROSTER)");
|
||||
|
|
@ -996,7 +1062,9 @@ void Guild::Query(WorldSession* session)
|
|||
for (size_t i = 0 ; i < GUILD_RANKS_MAX_COUNT; ++i) // show always 10 ranks
|
||||
{
|
||||
if (i < m_Ranks.size())
|
||||
{ data << m_Ranks[i].Name; }
|
||||
{
|
||||
data << m_Ranks[i].Name;
|
||||
}
|
||||
else
|
||||
{ data << uint8(0); } // null string
|
||||
}
|
||||
|
|
@ -1079,7 +1147,9 @@ uint32 Guild::GetAccountsNumber()
|
|||
{
|
||||
// not need recalculation
|
||||
if (m_accountsNumber)
|
||||
{ return m_accountsNumber; }
|
||||
{
|
||||
return m_accountsNumber;
|
||||
}
|
||||
|
||||
// We use a set to be sure each element will be unique
|
||||
std::set<uint32> accountsIdSet;
|
||||
|
|
@ -1119,7 +1189,9 @@ void Guild::LoadGuildEventLogFromDB()
|
|||
// 0 1 2 3 4 5
|
||||
QueryResult* result = CharacterDatabase.PQuery("SELECT LogGuid, EventType, PlayerGuid1, PlayerGuid2, NewRank, TimeStamp FROM guild_eventlog WHERE guildid=%u ORDER BY TimeStamp DESC,LogGuid DESC LIMIT %u", m_Id, GUILD_EVENTLOG_MAX_RECORDS);
|
||||
if (!result)
|
||||
{ return; }
|
||||
{
|
||||
return;
|
||||
}
|
||||
bool isNextLogGuidSet = false;
|
||||
// uint32 configCount = sWorld.getConfig(CONFIG_UINT32_GUILD_EVENT_LOG_COUNT);
|
||||
// First event in list will be the oldest and the latest event is last event in list
|
||||
|
|
@ -1164,7 +1236,9 @@ void Guild::LogGuildEvent(uint8 EventType, ObjectGuid playerGuid1, ObjectGuid pl
|
|||
m_GuildEventLogNextGuid = (m_GuildEventLogNextGuid + 1) % sWorld.getConfig(CONFIG_UINT32_GUILD_EVENT_LOG_COUNT);
|
||||
// Check max records limit
|
||||
if (m_GuildEventLog.size() >= GUILD_EVENTLOG_MAX_RECORDS)
|
||||
{ m_GuildEventLog.pop_front(); }
|
||||
{
|
||||
m_GuildEventLog.pop_front();
|
||||
}
|
||||
// Add event to list
|
||||
m_GuildEventLog.push_back(NewEvent);
|
||||
// Save event to DB
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue