diff options
Diffstat (limited to 'src/server/game/Battlefield/Battlefield.cpp')
| -rw-r--r-- | src/server/game/Battlefield/Battlefield.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/server/game/Battlefield/Battlefield.cpp b/src/server/game/Battlefield/Battlefield.cpp index f1018df29d6..aca20ef8334 100644 --- a/src/server/game/Battlefield/Battlefield.cpp +++ b/src/server/game/Battlefield/Battlefield.cpp @@ -164,13 +164,13 @@ bool Battlefield::Update(uint32 diff) if (m_uiKickDontAcceptTimer <= diff) { time_t now = GameTime::GetGameTime(); - for (uint8 team = 0; team < BG_TEAMS_COUNT; ++team) + for (uint8 team = 0; team < PVP_TEAMS_COUNT; ++team) for (PlayerTimerMap::iterator itr = m_InvitedPlayers[team].begin(); itr != m_InvitedPlayers[team].end(); ++itr) if (itr->second <= now) KickPlayerFromBattlefield(itr->first); InvitePlayersInZoneToWar(); - for (uint8 team = 0; team < BG_TEAMS_COUNT; ++team) + for (uint8 team = 0; team < PVP_TEAMS_COUNT; ++team) for (PlayerTimerMap::iterator itr = m_PlayersWillBeKick[team].begin(); itr != m_PlayersWillBeKick[team].end(); ++itr) if (itr->second <= now) KickPlayerFromBattlefield(itr->first); @@ -201,7 +201,7 @@ bool Battlefield::Update(uint32 diff) void Battlefield::InvitePlayersInZoneToQueue() { - for (uint8 team = 0; team < BG_TEAMS_COUNT; ++team) + for (uint8 team = 0; team < PVP_TEAMS_COUNT; ++team) for (auto itr = m_players[team].begin(); itr != m_players[team].end(); ++itr) if (Player* player = ObjectAccessor::FindPlayer(*itr)) InvitePlayerToQueue(player); @@ -218,7 +218,7 @@ void Battlefield::InvitePlayerToQueue(Player* player) void Battlefield::InvitePlayersInQueueToWar() { - for (uint8 team = 0; team < BG_TEAMS_COUNT; ++team) + for (uint8 team = 0; team < PVP_TEAMS_COUNT; ++team) { for (auto itr = m_PlayersInQueue[team].begin(); itr != m_PlayersInQueue[team].end(); ++itr) { @@ -238,7 +238,7 @@ void Battlefield::InvitePlayersInQueueToWar() void Battlefield::InvitePlayersInZoneToWar() { - for (uint8 team = 0; team < BG_TEAMS_COUNT; ++team) + for (uint8 team = 0; team < PVP_TEAMS_COUNT; ++team) { for (auto itr = m_players[team].begin(); itr != m_players[team].end(); ++itr) { @@ -297,7 +297,7 @@ void Battlefield::InitStalker(uint32 entry, Position const& pos) void Battlefield::KickAfkPlayers() { - for (uint8 team = 0; team < BG_TEAMS_COUNT; ++team) + for (uint8 team = 0; team < PVP_TEAMS_COUNT; ++team) for (auto itr = m_PlayersInWar[team].begin(); itr != m_PlayersInWar[team].end(); ++itr) if (Player* player = ObjectAccessor::FindPlayer(*itr)) if (player->isAFK()) @@ -316,7 +316,7 @@ void Battlefield::StartBattle() if (m_isActive) return; - for (uint8 team = 0; team < BG_TEAMS_COUNT; ++team) + for (uint8 team = 0; team < PVP_TEAMS_COUNT; ++team) { m_PlayersInWar[team].clear(); m_Groups[team].clear(); @@ -425,7 +425,7 @@ void Battlefield::TeamCastSpell(TeamId team, int32 spellId) void Battlefield::BroadcastPacketToZone(WorldPacket& data) const { - for (uint8 team = 0; team < BG_TEAMS_COUNT; ++team) + for (uint8 team = 0; team < PVP_TEAMS_COUNT; ++team) for (auto itr = m_players[team].begin(); itr != m_players[team].end(); ++itr) if (Player* player = ObjectAccessor::FindPlayer(*itr)) player->SendDirectMessage(&data); @@ -433,7 +433,7 @@ void Battlefield::BroadcastPacketToZone(WorldPacket& data) const void Battlefield::BroadcastPacketToQueue(WorldPacket& data) const { - for (uint8 team = 0; team < BG_TEAMS_COUNT; ++team) + for (uint8 team = 0; team < PVP_TEAMS_COUNT; ++team) for (auto itr = m_PlayersInQueue[team].begin(); itr != m_PlayersInQueue[team].end(); ++itr) if (Player* player = ObjectAccessor::FindConnectedPlayer(*itr)) player->SendDirectMessage(&data); @@ -441,7 +441,7 @@ void Battlefield::BroadcastPacketToQueue(WorldPacket& data) const void Battlefield::BroadcastPacketToWar(WorldPacket& data) const { - for (uint8 team = 0; team < BG_TEAMS_COUNT; ++team) + for (uint8 team = 0; team < PVP_TEAMS_COUNT; ++team) for (auto itr = m_PlayersInWar[team].begin(); itr != m_PlayersInWar[team].end(); ++itr) if (Player* player = ObjectAccessor::FindPlayer(*itr)) player->SendDirectMessage(&data); @@ -455,7 +455,7 @@ void Battlefield::SendWarning(uint8 id, WorldObject const* target /*= nullptr*/) void Battlefield::SendUpdateWorldState(uint32 field, uint32 value) { - for (uint8 i = 0; i < BG_TEAMS_COUNT; ++i) + for (uint8 i = 0; i < PVP_TEAMS_COUNT; ++i) for (auto itr = m_players[i].begin(); itr != m_players[i].end(); ++itr) if (Player* player = ObjectAccessor::FindPlayer(*itr)) player->SendUpdateWorldState(field, value); @@ -964,7 +964,7 @@ bool BfCapturePoint::Update(uint32 diff) { float radius = capturePoint->GetGOInfo()->capturePoint.radius; - for (uint8 team = 0; team < BG_TEAMS_COUNT; ++team) + for (uint8 team = 0; team < PVP_TEAMS_COUNT; ++team) { for (GuidSet::iterator itr = m_activePlayers[team].begin(); itr != m_activePlayers[team].end();) { @@ -1079,7 +1079,7 @@ bool BfCapturePoint::Update(uint32 diff) void BfCapturePoint::SendUpdateWorldState(uint32 field, uint32 value) { - for (uint8 team = 0; team < BG_TEAMS_COUNT; ++team) + for (uint8 team = 0; team < PVP_TEAMS_COUNT; ++team) for (GuidSet::iterator itr = m_activePlayers[team].begin(); itr != m_activePlayers[team].end(); ++itr) // send to all players present in the area if (Player* player = ObjectAccessor::FindPlayer(*itr)) player->SendUpdateWorldState(field, value); |