diff options
author | Machiavelli <none@none> | 2009-04-14 22:06:33 +0200 |
---|---|---|
committer | Machiavelli <none@none> | 2009-04-14 22:06:33 +0200 |
commit | ad24fa732848d529194efcd3e639a7c5cd41d7f0 (patch) | |
tree | e97a427a8158062f426ecb007803380a206ffd16 /src | |
parent | 90c24efab4443d825dd04380b85c74c73d8848fd (diff) |
* Battleground update; change some datatypes, correct comment, minor tab -> space cleanup
--HG--
branch : trunk
Diffstat (limited to 'src')
-rw-r--r-- | src/game/BattleGroundMgr.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/game/BattleGroundMgr.cpp b/src/game/BattleGroundMgr.cpp index 6bd0f65dbf2..54d2538068d 100644 --- a/src/game/BattleGroundMgr.cpp +++ b/src/game/BattleGroundMgr.cpp @@ -652,18 +652,18 @@ void BattleGroundQueue::Update(uint32 bgTypeId, uint32 queue_id, uint8 arenatype std::list<GroupQueueInfo* >::iterator itr; - //Send corrent ammount of invites to both faction at start of BG, not all in current queue, makes starting teams even - unsigned int QUEUED_HORDE = m_SelectionPools[NORMAL_HORDE].SelectedGroups.size(); - unsigned int QUEUED_ALLIANCE= m_SelectionPools[NORMAL_ALLIANCE].SelectedGroups.size(); - unsigned int maxbginvites = 0; + // Send amount of invites based on the difference between the sizes of the two faction's queues + uint32 QUEUED_HORDE = m_SelectionPools[NORMAL_HORDE].SelectedGroups.size(); + uint32 QUEUED_ALLIANCE = m_SelectionPools[NORMAL_ALLIANCE].SelectedGroups.size(); + uint16 maxbginvites = 0; if(QUEUED_ALLIANCE <= QUEUED_HORDE) maxbginvites = QUEUED_ALLIANCE; else - maxbginvites = QUEUED_HORDE; + maxbginvites = QUEUED_HORDE; // invite groups from horde selection pool - int invitecounter = 0; + uint16 invitecounter = 0; for(itr = m_SelectionPools[NORMAL_HORDE].SelectedGroups.begin(); itr != m_SelectionPools[NORMAL_HORDE].SelectedGroups.end(); ++itr) { if (invitecounter >= maxbginvites) @@ -675,7 +675,7 @@ void BattleGroundQueue::Update(uint32 bgTypeId, uint32 queue_id, uint8 arenatype // invite groups from ally selection pool invitecounter = 0; for(itr = m_SelectionPools[NORMAL_ALLIANCE].SelectedGroups.begin(); itr != m_SelectionPools[NORMAL_ALLIANCE].SelectedGroups.end(); ++itr) - { + { if (invitecounter >= maxbginvites) return; InviteGroupToBG((*itr),bg2,ALLIANCE); |