josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Code Style. Closes issue 1515

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Spp
2010-05-02 04:30:11 +02:00
parent e2d6abb681
commit 208c05bf41
1 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/ArenaTeam.cpp
+6 -20
View File
@@ -24,12 +24,12 @@
void ArenaTeamMember::ModifyPersonalRating(Player* plr, int32 mod, uint32 slot) void ArenaTeamMember::ModifyPersonalRating(Player* plr, int32 mod, uint32 slot)
{ {
if (int32(personal_rating) + mod < 0) if (int32(personal_rating) + mod < 0)
personal_rating = 0; personal_rating = 0;
else else
personal_rating += mod; personal_rating += mod;
if (plr) if (plr)
plr->SetArenaTeamInfoField(slot, ARENA_TEAM_PERSONAL_RATING, personal_rating); plr->SetArenaTeamInfoField(slot, ARENA_TEAM_PERSONAL_RATING, personal_rating);
} }
ArenaTeam::ArenaTeam() ArenaTeam::ArenaTeam()
@@ -155,9 +155,7 @@ bool ArenaTeam::AddMember(const uint64& PlayerGuid)
newmember.personal_rating = 1000; newmember.personal_rating = 1000;
} }
else else
{
newmember.personal_rating = 1500; newmember.personal_rating = 1500;
}
m_members.push_back(newmember); m_members.push_back(newmember);
CharacterDatabase.PExecute("INSERT INTO arena_team_member (arenateamid, guid, personal_rating) VALUES ('%u', '%u', '%u')", m_TeamId, GUID_LOPART(newmember.guid), newmember.personal_rating); CharacterDatabase.PExecute("INSERT INTO arena_team_member (arenateamid, guid, personal_rating) VALUES ('%u', '%u', '%u')", m_TeamId, GUID_LOPART(newmember.guid), newmember.personal_rating);
@@ -288,13 +286,11 @@ void ArenaTeam::SetCaptain(const uint64& guid)
void ArenaTeam::DelMember(uint64 guid) void ArenaTeam::DelMember(uint64 guid)
{ {
for (MemberList::iterator itr = m_members.begin(); itr != m_members.end(); ++itr) for (MemberList::iterator itr = m_members.begin(); itr != m_members.end(); ++itr)
{
if (itr->guid == guid) if (itr->guid == guid)
{ {
m_members.erase(itr); m_members.erase(itr);
break; break;
} }
}
if (Player *player = objmgr.GetPlayer(guid)) if (Player *player = objmgr.GetPlayer(guid))
{ {
@@ -311,22 +307,16 @@ void ArenaTeam::Disband(WorldSession *session)
{ {
// event // event
if (session) if (session)
{
// probably only 1 string required... // probably only 1 string required...
BroadcastEvent(ERR_ARENA_TEAM_DISBANDED_S, 0, 2, session->GetPlayerName(), GetName(), ""); BroadcastEvent(ERR_ARENA_TEAM_DISBANDED_S, 0, 2, session->GetPlayerName(), GetName(), "");
}
while (!m_members.empty()) while (!m_members.empty())
{
// Removing from members is done in DelMember. // Removing from members is done in DelMember.
DelMember(m_members.front().guid); DelMember(m_members.front().guid);
}
if (session) if (session)
{
if (Player *player = session->GetPlayer()) if (Player *player = session->GetPlayer())
sLog.outArena("Player: %s [GUID: %u] disbanded arena team type: %u [Id: %u].", player->GetName(), player->GetGUIDLow(), GetType(), GetId()); sLog.outArena("Player: %s [GUID: %u] disbanded arena team type: %u [Id: %u].", player->GetName(), player->GetGUIDLow(), GetType(), GetId());
}
CharacterDatabase.BeginTransaction(); CharacterDatabase.BeginTransaction();
CharacterDatabase.PExecute("DELETE FROM arena_team WHERE arenateamid = '%u'", m_TeamId); CharacterDatabase.PExecute("DELETE FROM arena_team WHERE arenateamid = '%u'", m_TeamId);
@@ -765,12 +755,8 @@ void ArenaTeam::FinishWeek()
bool ArenaTeam::IsFighting() const bool ArenaTeam::IsFighting() const
{ {
for (MemberList::const_iterator itr = m_members.begin(); itr != m_members.end(); ++itr) for (MemberList::const_iterator itr = m_members.begin(); itr != m_members.end(); ++itr)
{
if (Player *p = objmgr.GetPlayer(itr->guid)) if (Player *p = objmgr.GetPlayer(itr->guid))
{
if (p->GetMap()->IsBattleArena()) if (p->GetMap()->IsBattleArena())
return true; return true;
}
}
return false; return false;
} }