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

[8466] Applied mangos coding style for Guild code.

Browse source 
Signed-off-by: Triply <triply@getmangos.com>
This commit is contained in:
Triply 2009-09-04 15:39:34 +02:00
parent 3b2624b86f
commit d24fd20cc3
3 changed files with 238 additions and 236 deletions
Download patch file Download diff file Expand all files Collapse all files

92
src/game/Guild.cpp
View file

@ -137,24 +137,25 @@ bool Guild::AddMember(uint64 plGuid, uint32 plRank)
if (pl)
{
newmember.name = pl->GetName();
newmember.zoneId = pl->GetZoneId();
newmember.level = pl->getLevel();
newmember.Name = pl->GetName();
newmember.Level = pl->getLevel();
newmember.Class = pl->getClass();
newmember.ZoneId = pl->GetZoneId();
}
else
{
QueryResult *result = CharacterDatabase.PQuery("SELECT name,zone,level,class FROM characters WHERE guid = '%u'", GUID_LOPART(plGuid));
// 0 1 2 3
QueryResult *result = CharacterDatabase.PQuery("SELECT name,level,class,zone FROM characters WHERE guid = '%u'", GUID_LOPART(plGuid));
if (!result)
return false; // player doesn't exist
Field *fields = result->Fetch();
newmember.name = fields[0].GetCppString();
newmember.zoneId = fields[1].GetUInt32();
newmember.level = fields[2].GetUInt8();
newmember.Class = fields[3].GetUInt8();
newmember.Name = fields[0].GetCppString();
newmember.Level = fields[1].GetUInt8();
newmember.Class = fields[2].GetUInt8();
newmember.ZoneId = fields[3].GetUInt32();
delete result;
if (newmember.level < 1 || newmember.level > STRONG_MAX_LEVEL ||
if (newmember.Level < 1 || newmember.Level > STRONG_MAX_LEVEL ||
newmember.Class < CLASS_WARRIOR || newmember.Class >= MAX_CLASSES)
{
sLog.outError("Player (GUID: %u) has a broken data in field `characters` table, cannot add him to guild.",GUID_LOPART(plGuid));
@ -165,7 +166,7 @@ bool Guild::AddMember(uint64 plGuid, uint32 plRank)
newmember.RankId = plRank;
newmember.OFFnote = (std::string)"";
newmember.Pnote = (std::string)"";
newmember.logout_time = time(NULL);
newmember.LogoutTime = time(NULL);
newmember.BankResetTimeMoney = 0; // this will force update at first query
for (int i = 0; i < GUILD_BANK_MAX_TABS; ++i)
newmember.BankResetTimeTab[i] = 0;
@ -345,8 +346,8 @@ 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)
{
std::string name = m_Ranks[i].name;
uint32 rights = m_Ranks[i].rights;
std::string name = m_Ranks[i].Name;
uint32 rights = m_Ranks[i].Rights;
CharacterDatabase.escape_string(name);
CharacterDatabase.PExecute( "INSERT INTO guild_rank (guildid,rid,rname,rights) VALUES ('%u', '%u', '%s', '%u')", GuildId, uint32(i), name.c_str(), rights);
}
@ -365,7 +366,7 @@ bool Guild::LoadMembersFromDB(uint32 GuildId)
// 12 13 14 15 16 17
"BankResetTimeTab3, BankRemSlotsTab3, BankResetTimeTab4, BankRemSlotsTab4, BankResetTimeTab5, BankRemSlotsTab5,"
// 18 19 20 21 22
"characters.name, characters.level, characters.zone, characters.class, characters.logout_time "
"characters.name, characters.level, characters.class, characters.zone, characters.logout_time "
"FROM guild_member LEFT JOIN characters ON characters.guid = guild_member.guid WHERE guildid = '%u'", GuildId);
if (!result)
@ -391,25 +392,25 @@ bool Guild::LoadMembersFromDB(uint32 GuildId)
newmember.BankRemSlotsTab[i] = fields[7+(2*i)].GetUInt32();
}
newmember.name = fields[18].GetCppString();
newmember.level = fields[19].GetUInt8();
newmember.zoneId = fields[20].GetUInt32();
newmember.Class = fields[21].GetUInt8();
newmember.logout_time = fields[22].GetUInt64();
newmember.Name = fields[18].GetCppString();
newmember.Level = fields[19].GetUInt8();
newmember.Class = fields[20].GetUInt8();
newmember.ZoneId = fields[21].GetUInt32();
newmember.LogoutTime = fields[22].GetUInt64();
//this code will remove unexisting character guids from guild
if(newmember.level < 1 || newmember.level > STRONG_MAX_LEVEL) // can be at broken `data` field
if (newmember.Level < 1 || newmember.Level > STRONG_MAX_LEVEL) // can be at broken `data` field
{
sLog.outError("Player (GUID: %u) has a broken data in field `characters`.`data`, deleting him from guild!",GUID_LOPART(guid));
CharacterDatabase.PExecute("DELETE FROM guild_member WHERE guid = '%u'", GUID_LOPART(guid));
continue;
}
if(!newmember.zoneId)
if (!newmember.ZoneId)
{
sLog.outError("Player (GUID: %u) has broken zone-data", GUID_LOPART(guid));
// here it will also try the same, to get the zone from characters-table, but additional it tries to find
// the zone through xy coords .. this is a bit redundant, but shouldn't be called often
newmember.zoneId = Player::GetZoneIdFromDB(guid);
newmember.ZoneId = Player::GetZoneIdFromDB(guid);
}
if (newmember.Class < CLASS_WARRIOR || newmember.Class >= MAX_CLASSES) // can be at broken `class` field
{
@ -438,10 +439,10 @@ void Guild::SetMemberStats(uint64 guid)
Player *pl = ObjectAccessor::FindPlayer(guid);
if (!pl)
return;
itr->second.name = pl->GetName();
itr->second.level = pl->getLevel();
itr->second.Name = pl->GetName();
itr->second.Level = pl->getLevel();
itr->second.Class = pl->getClass();
itr->second.zoneId = pl->GetZoneId();
itr->second.ZoneId = pl->GetZoneId();
}
void Guild::SetLeader(uint64 guid)
@ -490,17 +491,17 @@ void Guild::DelMember(uint64 guid, bool isDisbanding)
// when leader non-exist (at guild load with deleted leader only) not send broadcasts
if (oldLeader)
{
WorldPacket data(SMSG_GUILD_EVENT, (1+1+(oldLeader->name).size()+1+(best->name).size()+1));
WorldPacket data(SMSG_GUILD_EVENT, (1+1+(oldLeader->Name).size()+1+(best->Name).size()+1));
data << (uint8)GE_LEADER_CHANGED;
data << (uint8)2;
data << oldLeader->name;
data << best->name;
data << oldLeader->Name;
data << best->Name;
BroadcastPacket(&data);
data.Initialize(SMSG_GUILD_EVENT, (1+1+(oldLeader->name).size()+1));
data.Initialize(SMSG_GUILD_EVENT, (1+1+(oldLeader->Name).size()+1));
data << (uint8)GE_LEFT;
data << (uint8)1;
data << oldLeader->name;
data << oldLeader->Name;
BroadcastPacket(&data);
}
@ -660,7 +661,7 @@ std::string Guild::GetRankName(uint32 rankId)
if (rankId >= m_Ranks.size())
return "<unknown>";
return m_Ranks[rankId].name;
return m_Ranks[rankId].Name;
}
uint32 Guild::GetRankRights(uint32 rankId)
@ -668,7 +669,7 @@ uint32 Guild::GetRankRights(uint32 rankId)
if (rankId >= m_Ranks.size())
return 0;
return m_Ranks[rankId].rights;
return m_Ranks[rankId].Rights;
}
void Guild::SetRankName(uint32 rankId, std::string name_)
@ -676,7 +677,7 @@ void Guild::SetRankName(uint32 rankId, std::string name_)
if (rankId >= m_Ranks.size())
return;
m_Ranks[rankId].name = name_;
m_Ranks[rankId].Name = name_;
// name now can be used for encoding to DB
CharacterDatabase.escape_string(name_);
@ -688,7 +689,7 @@ void Guild::SetRankRights(uint32 rankId, uint32 rights)
if (rankId >= m_Ranks.size())
return;
m_Ranks[rankId].rights = rights;
m_Ranks[rankId].Rights = rights;
CharacterDatabase.PExecute("UPDATE guild_rank SET rights='%u' WHERE rid='%u' AND guildid='%u'", rights, rankId, m_Id);
}
@ -718,6 +719,7 @@ void Guild::Disband()
CharacterDatabase.PExecute("DELETE FROM guild WHERE guildid = '%u'", m_Id);
CharacterDatabase.PExecute("DELETE FROM guild_rank WHERE guildid = '%u'", m_Id);
CharacterDatabase.PExecute("DELETE FROM guild_bank_tab WHERE guildid = '%u'", m_Id);
// TODO item_instance should be deleted ?
CharacterDatabase.PExecute("DELETE FROM guild_bank_item WHERE guildid = '%u'", m_Id);
CharacterDatabase.PExecute("DELETE FROM guild_bank_right WHERE guildid = '%u'", m_Id);
CharacterDatabase.PExecute("DELETE FROM guild_bank_eventlog WHERE guildid = '%u'", m_Id);
@ -737,7 +739,7 @@ void Guild::Roster(WorldSession *session)
data << (uint32)m_Ranks.size();
for (RankList::const_iterator ritr = m_Ranks.begin(); ritr != m_Ranks.end(); ++ritr)
{
data << uint32(ritr->rights);
data << uint32(ritr->Rights);
data << uint32(ritr->BankMoneyPerDay); // count of: withdraw gold(gold/day) Note: in game set gold, in packet set bronze.
for (int i = 0; i < GUILD_BANK_MAX_TABS; ++i)
{
@ -764,13 +766,13 @@ void Guild::Roster(WorldSession *session)
{
data << uint64(MAKE_NEW_GUID(itr->first, 0, HIGHGUID_PLAYER));
data << uint8(0);
data << itr->second.name;
data << itr->second.Name;
data << uint32(itr->second.RankId);
data << uint8(itr->second.level);
data << uint8(itr->second.Level);
data << uint8(itr->second.Class);
data << uint8(0); // new 2.4.0
data << uint32(itr->second.zoneId);
data << float(float(time(NULL)-itr->second.logout_time) / DAY);
data << uint32(itr->second.ZoneId);
data << float(float(time(NULL)-itr->second.LogoutTime) / DAY);
data << itr->second.Pnote;
data << itr->second.OFFnote;
}
@ -789,7 +791,7 @@ void Guild::Query(WorldSession *session)
for (size_t i = 0 ; i < 10; ++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
}
@ -822,7 +824,7 @@ void Guild::UpdateLogoutTime(uint64 guid)
if (itr == members.end() )
return;
itr->second.logout_time = time(NULL);
itr->second.Level = time(NULL);
if (m_OnlineMembers > 0)
--m_OnlineMembers;
@ -1056,7 +1058,7 @@ void Guild::DisplayGuildBankContentUpdate(uint8 TabId, GuildItemPosCountVec cons
data << uint8(slots.size()); // updates count
for (GuildItemPosCountVec::const_iterator itr = slots.begin(); itr != slots.end(); ++itr)
AppendDisplayGuildBankSlot(data, tab, itr->slot);
AppendDisplayGuildBankSlot(data, tab, itr->Slot);
for (MemberList::const_iterator itr = members.begin(); itr != members.end(); ++itr)
{
@ -1100,7 +1102,7 @@ void Guild::DisplayGuildBankTabsInfo(WorldSession *session)
data << uint8(m_PurchasedTabs); // here is the number of tabs
for(int i = 0; i < m_PurchasedTabs; ++i)
for (uint8 i = 0; i < m_PurchasedTabs; ++i)
{
data << m_TabListMap[i]->Name.c_str();
data << m_TabListMap[i]->Icon.c_str();
@ -1734,8 +1736,8 @@ Item* Guild::StoreItem(uint8 tabId, GuildItemPosCountVec const& dest, Item* pIte
for (GuildItemPosCountVec::const_iterator itr = dest.begin(); itr != dest.end(); )
{
uint8 slot = itr->slot;
uint32 count = itr->count;
uint8 slot = itr->Slot;
uint32 count = itr->Count;
++itr;
@ -2408,7 +2410,7 @@ void Guild::MoveFromCharToBank( Player * pl, uint8 PlayerBag, uint8 PlayerSlot,
bool GuildItemPosCount::isContainedIn(GuildItemPosCountVec const &vec) const
{
for(GuildItemPosCountVec::const_iterator itr = vec.begin(); itr != vec.end();++itr)
if(itr->slot == slot)
if (itr->Slot == this->Slot)
return true;
return false;

26
src/game/Guild.h
View file

@ -237,25 +237,25 @@ struct GuildBankTab
struct GuildItemPosCount
{
GuildItemPosCount(uint8 _slot, uint32 _count) : slot(_slot), count(_count) {}
GuildItemPosCount(uint8 _slot, uint32 _count) : Slot(_slot), Count(_count) {}
bool isContainedIn(std::vector<GuildItemPosCount> const& vec) const;
uint8 slot;
uint32 count;
uint8 Slot;
uint32 Count;
};
typedef std::vector<GuildItemPosCount> GuildItemPosCountVec;
struct MemberSlot
{
uint64 logout_time;
std::string name;
std::string Name;
uint32 RankId;
uint8 Level;
uint8 Class;
uint32 ZoneId;
uint64 LogoutTime;
std::string Pnote;
std::string OFFnote;
uint32 RankId;
uint32 zoneId;
uint8 level;
uint8 Class;
uint32 BankResetTimeMoney;
uint32 BankRemMoney;
uint32 BankResetTimeTab[GUILD_BANK_MAX_TABS];
@ -264,7 +264,7 @@ struct MemberSlot
struct RankInfo
{
RankInfo(const std::string& _name, uint32 _rights, uint32 _money) : name(_name), rights(_rights), BankMoneyPerDay(_money)
RankInfo(const std::string& _name, uint32 _rights, uint32 _money) : Name(_name), Rights(_rights), BankMoneyPerDay(_money)
{
for(uint8 i = 0; i < GUILD_BANK_MAX_TABS; ++i)
{
@ -273,8 +273,8 @@ struct RankInfo
}
}
std::string name;
uint32 rights;
std::string Name;
uint32 Rights;
uint32 BankMoneyPerDay;
uint32 TabRight[GUILD_BANK_MAX_TABS];
uint32 TabSlotPerDay[GUILD_BANK_MAX_TABS];
@ -365,7 +365,7 @@ class Guild
{
for(MemberList::iterator itr = members.begin(); itr != members.end(); ++itr)
{
if(itr->second.name == name)
if(itr->second.Name == name)
{
guid = itr->first;
return &itr->second;

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "8465"
#define REVISION_NR "8466"
#endif // __REVISION_NR_H__