diff options
author | Spp <none@none> | 2010-04-07 19:14:10 +0200 |
---|---|---|
committer | Spp <none@none> | 2010-04-07 19:14:10 +0200 |
commit | d19e12708001fbef2308be0e8cb5375a2ac7af48 (patch) | |
tree | 09fc8f67a6197802e0512950f0b0a3438a9834e8 /src/game/ArenaTeam.cpp | |
parent | 2e127f7a30706dc1d40c65de22ff02851732da24 (diff) |
Code style (game + scripts only):
"if(" --> "if ("
--HG--
branch : trunk
Diffstat (limited to 'src/game/ArenaTeam.cpp')
-rw-r--r-- | src/game/ArenaTeam.cpp | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/src/game/ArenaTeam.cpp b/src/game/ArenaTeam.cpp index dd7201ecf52..da46ab8ce50 100644 --- a/src/game/ArenaTeam.cpp +++ b/src/game/ArenaTeam.cpp @@ -28,7 +28,7 @@ void ArenaTeamMember::ModifyPersonalRating(Player* plr, int32 mod, uint32 slot) personal_rating = 0; else personal_rating += mod; - if(plr) + if (plr) plr->SetUInt32Value(PLAYER_FIELD_ARENA_TEAM_INFO_1_1 + (slot * ARENA_TEAM_END) + ARENA_TEAM_PERSONAL_RATING, personal_rating); } @@ -62,9 +62,9 @@ ArenaTeam::~ArenaTeam() bool ArenaTeam::Create(uint64 captainGuid, uint32 type, std::string ArenaTeamName) { - if(!objmgr.GetPlayer(captainGuid)) // player not exist + if (!objmgr.GetPlayer(captainGuid)) // player not exist return false; - if(objmgr.GetArenaTeamByName(ArenaTeamName)) // arena team with this name already exist + if (objmgr.GetArenaTeamByName(ArenaTeamName)) // arena team with this name already exist return false; sLog.outDebug("GUILD: creating arena team %s to leader: %u", ArenaTeamName.c_str(), GUID_LOPART(captainGuid)); @@ -100,13 +100,13 @@ bool ArenaTeam::AddMember(const uint64& PlayerGuid) uint8 plClass; // arena team is full (can't have more than type * 2 players!) - if(GetMembersSize() >= GetType() * 2) + if (GetMembersSize() >= GetType() * 2) return false; Player *pl = objmgr.GetPlayer(PlayerGuid); - if(pl) + if (pl) { - if(pl->GetArenaTeamId(GetSlot())) + if (pl->GetArenaTeamId(GetSlot())) { sLog.outError("Arena::AddMember() : player already in this sized team"); return false; @@ -119,14 +119,14 @@ bool ArenaTeam::AddMember(const uint64& PlayerGuid) { // 0 1 QueryResult_AutoPtr result = CharacterDatabase.PQuery("SELECT name, class FROM characters WHERE guid='%u'", GUID_LOPART(PlayerGuid)); - if(!result) + if (!result) return false; plName = (*result)[0].GetCppString(); plClass = (*result)[1].GetUInt8(); // check if player already in arenateam of that size - if(Player::GetArenaTeamIdFromDB(PlayerGuid, GetType()) != 0) + if (Player::GetArenaTeamIdFromDB(PlayerGuid, GetType()) != 0) { sLog.outError("Arena::AddMember() : player already in this sized team"); return false; @@ -162,14 +162,14 @@ bool ArenaTeam::AddMember(const uint64& PlayerGuid) CharacterDatabase.PExecute("INSERT INTO arena_team_member (arenateamid, guid, personal_rating) VALUES ('%u', '%u', '%u')", m_TeamId, GUID_LOPART(newmember.guid), newmember.personal_rating ); - if(pl) + if (pl) { pl->SetInArenaTeam(m_TeamId, GetSlot(), GetType()); pl->SetArenaTeamIdInvited(0); pl->SetUInt32Value(PLAYER_FIELD_ARENA_TEAM_INFO_1_1 + (GetSlot() * ARENA_TEAM_END) + ARENA_TEAM_PERSONAL_RATING, newmember.personal_rating ); // hide promote/remove buttons - if(m_CaptainGuid != PlayerGuid) + if (m_CaptainGuid != PlayerGuid) pl->SetUInt32Value(PLAYER_FIELD_ARENA_TEAM_INFO_1_1 + (GetSlot() * ARENA_TEAM_END) + ARENA_TEAM_MEMBER, 1); sLog.outArena("Player: %s [GUID: %u] joined arena team type: %u [Id: %u].", pl->GetName(), pl->GetGUIDLow(), GetType(), GetId()); } @@ -178,7 +178,7 @@ bool ArenaTeam::AddMember(const uint64& PlayerGuid) bool ArenaTeam::LoadArenaTeamFromDB(QueryResult_AutoPtr arenaTeamDataResult) { - if(!arenaTeamDataResult) + if (!arenaTeamDataResult) return false; Field *fields = arenaTeamDataResult->Fetch(); @@ -205,7 +205,7 @@ bool ArenaTeam::LoadArenaTeamFromDB(QueryResult_AutoPtr arenaTeamDataResult) bool ArenaTeam::LoadMembersFromDB(QueryResult_AutoPtr arenaTeamMembersResult) { - if(!arenaTeamMembersResult) + if (!arenaTeamMembersResult) return false; bool captainPresentInTeam = false; @@ -253,7 +253,7 @@ bool ArenaTeam::LoadMembersFromDB(QueryResult_AutoPtr arenaTeamMembersResult) m_members.push_back(newmember); }while (arenaTeamMembersResult->NextRow()); - if(Empty() || !captainPresentInTeam) + if (Empty() || !captainPresentInTeam) { // arena team is empty or captain is not in team, delete from db sLog.outErrorDb("ArenaTeam %u does not have any members or its captain is not in team, disbanding it...", m_TeamId); @@ -267,7 +267,7 @@ void ArenaTeam::SetCaptain(const uint64& guid) { // disable remove/promote buttons Player *oldcaptain = objmgr.GetPlayer(GetCaptain()); - if(oldcaptain) + if (oldcaptain) oldcaptain->SetUInt32Value(PLAYER_FIELD_ARENA_TEAM_INFO_1_1 + (GetSlot() * ARENA_TEAM_END) + ARENA_TEAM_MEMBER, 1); // set new captain @@ -278,7 +278,7 @@ void ArenaTeam::SetCaptain(const uint64& guid) // enable remove/promote buttons Player *newcaptain = objmgr.GetPlayer(guid); - if(newcaptain) + if (newcaptain) { newcaptain->SetUInt32Value(PLAYER_FIELD_ARENA_TEAM_INFO_1_1 + (GetSlot() * ARENA_TEAM_END) + ARENA_TEAM_MEMBER, 0); sLog.outArena("Player: %s [GUID: %u] promoted player: %s [GUID: %u] to leader of arena team [Id: %u] [Type: %u].", oldcaptain->GetName(), oldcaptain->GetGUIDLow(), newcaptain->GetName(), newcaptain->GetGUIDLow(), GetId(), GetType()); @@ -296,7 +296,7 @@ void ArenaTeam::DelMember(uint64 guid) } } - if(Player *player = objmgr.GetPlayer(guid)) + if (Player *player = objmgr.GetPlayer(guid)) { player->GetSession()->SendArenaTeamCommandResult(ERR_ARENA_TEAM_QUIT_S, GetName(), "", 0); // delete all info regarding this team @@ -325,7 +325,7 @@ void ArenaTeam::Disband(WorldSession *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()); } @@ -364,7 +364,7 @@ void ArenaTeam::Roster(WorldSession *session) data << uint32(itr->games_season); // played this season data << uint32(itr->wins_season); // wins this season data << uint32(itr->personal_rating); // personal rating - if(unk308) + if (unk308) { data << float(0.0); // 308 unk data << float(0.0); // 308 unk @@ -410,7 +410,7 @@ void ArenaTeam::NotifyStatsChanged() for (MemberList::const_iterator itr = m_members.begin(); itr != m_members.end(); ++itr) { Player * plr = objmgr.GetPlayer(itr->guid); - if(plr) + if (plr) Stats(plr->GetSession()); } } @@ -418,7 +418,7 @@ void ArenaTeam::NotifyStatsChanged() void ArenaTeam::InspectStats(WorldSession *session, uint64 guid) { ArenaTeamMember* member = GetMember(guid); - if(!member) + if (!member) return; WorldPacket data(MSG_INSPECT_ARENA_TEAMS, 8+1+4*6); @@ -483,7 +483,7 @@ void ArenaTeam::BroadcastPacket(WorldPacket *packet) for (MemberList::const_iterator itr = m_members.begin(); itr != m_members.end(); ++itr) { Player *player = objmgr.GetPlayer(itr->guid); - if(player) + if (player) player->GetSession()->SendPacket(packet); } } @@ -505,7 +505,7 @@ uint8 ArenaTeam::GetSlotByType( uint32 type ) bool ArenaTeam::HaveMember( const uint64& guid ) const { for (MemberList::const_iterator itr = m_members.begin(); itr != m_members.end(); ++itr) - if(itr->guid == guid) + if (itr->guid == guid) return true; return false; @@ -605,7 +605,7 @@ void ArenaTeam::MemberLost(Player * plr, uint32 againstRating) // called for each participant of a match after losing for (MemberList::iterator itr = m_members.begin(); itr != m_members.end(); ++itr) { - if(itr->guid == plr->GetGUID()) + if (itr->guid == plr->GetGUID()) { // update personal rating float chance = GetChanceAgainst(itr->personal_rating, againstRating); @@ -629,7 +629,7 @@ void ArenaTeam::OfflineMemberLost(uint64 guid, uint32 againstRating) // called for offline player after ending rated arena match! for (MemberList::iterator itr = m_members.begin(); itr != m_members.end(); ++itr) { - if(itr->guid == guid) + if (itr->guid == guid) { // update personal rating float chance = GetChanceAgainst(itr->personal_rating, againstRating); @@ -653,7 +653,7 @@ void ArenaTeam::MemberWon(Player * plr, uint32 againstRating) // called for each participant after winning a match for (MemberList::iterator itr = m_members.begin(); itr != m_members.end(); ++itr) { - if(itr->guid == plr->GetGUID()) + if (itr->guid == plr->GetGUID()) { // update personal rating float chance = GetChanceAgainst(itr->personal_rating, againstRating); |