diff options
author | Spp <spp@jorge.gr> | 2010-06-01 09:38:05 +0200 |
---|---|---|
committer | Spp <spp@jorge.gr> | 2010-06-01 09:38:05 +0200 |
commit | d53f91ff327ea4f73d7dd16e7246d50150c2458b (patch) | |
tree | 599618cdfa3a05b3fd697abea2a6e2d556357629 | |
parent | 768952ae7105063b61148a5b177b453de3a564f1 (diff) |
Dungeon finder: Fix typos
- Add missing credits from previous Dungeon Finder commit (6f13a4afc4)
* Thanks to Zor for packet structure
* Thanks to Taliesin for initial Queue design
--HG--
branch : trunk
-rw-r--r-- | src/game/LFG.h | 10 | ||||
-rw-r--r-- | src/game/LFGMgr.cpp | 40 |
2 files changed, 25 insertions, 25 deletions
diff --git a/src/game/LFG.h b/src/game/LFG.h index 2581f08b9b9..c1b55443852 100644 --- a/src/game/LFG.h +++ b/src/game/LFG.h @@ -24,11 +24,11 @@ enum LfgRoles { - ROL_NONE = 0x00, - ROL_LEADER = 0x01, - ROL_TANK = 0x02, - ROL_HEALER = 0x04, - ROL_DAMAGE = 0x08, + ROLE_NONE = 0x00, + ROLE_LEADER = 0x01, + ROLE_TANK = 0x02, + ROLE_HEALER = 0x04, + ROLE_DAMAGE = 0x08, }; enum LfgUpdateType diff --git a/src/game/LFGMgr.cpp b/src/game/LFGMgr.cpp index fffba750180..7b96474d7f8 100644 --- a/src/game/LFGMgr.cpp +++ b/src/game/LFGMgr.cpp @@ -93,16 +93,16 @@ void LFGQueue::Update() if (!plr) continue; rol = itPlayer->second; - if (rol & ROL_TANK) + if (rol & ROLE_TANK) { - if (rol & ROL_HEALER || rol & ROL_DAMAGE) + if (rol & ROLE_HEALER || rol & ROLE_DAMAGE) waitTime = avgWaitTime; else waitTime = waitTimeTanks; } - else if (rol & ROL_HEALER) + else if (rol & ROLE_HEALER) { - if (rol & ROL_DAMAGE) + if (rol & ROLE_DAMAGE) waitTime = avgWaitTime; else waitTime = waitTimeDps; @@ -322,9 +322,9 @@ void LFGMgr::Join(Player *plr) uint8 tanks = LFG_TANKS_NEEDED; uint8 healers = LFG_HEALERS_NEEDED; uint8 dps = LFG_DPS_NEEDED; - if (plr->m_lookingForGroup.roles & ROL_TANK) + if (plr->m_lookingForGroup.roles & ROLE_TANK) --tanks; - else if (plr->m_lookingForGroup.roles & ROL_HEALER) + else if (plr->m_lookingForGroup.roles & ROLE_HEALER) --healers; else --dps; @@ -436,14 +436,14 @@ void LFGMgr::UpdateRoleCheck(Group *grp, Player *plr /* = NULL*/) if (plr) { // Player selected no role. - if (plr->m_lookingForGroup.roles < ROL_TANK) + if (plr->m_lookingForGroup.roles < ROLE_TANK) pRoleCheck->result = LFG_ROLECHECK_NO_ROLE; else { // Check if all players have selected a role pRoleCheck->roles[plr->GetGUID()] = plr->m_lookingForGroup.roles; uint8 size = 0; - for (LfgRolesMap::const_iterator itRoles = pRoleCheck->roles.begin(); itRoles != pRoleCheck->roles.end() && itRoles->second != ROL_NONE; ++itRoles) + for (LfgRolesMap::const_iterator itRoles = pRoleCheck->roles.begin(); itRoles != pRoleCheck->roles.end() && itRoles->second != ROLE_NONE; ++itRoles) ++size; if (pRoleCheck->roles.size() == size) @@ -541,9 +541,9 @@ void LFGMgr::UpdateRoleCheck(Group *grp, Player *plr /* = NULL*/) uint8 dps = LFG_DPS_NEEDED; for (LfgRolesMap::const_iterator it = check_roles.begin(); it != check_roles.end(); ++it) { - if (it->second & ROL_TANK) + if (it->second & ROLE_TANK) --tanks; - else if (it->second & ROL_HEALER) + else if (it->second & ROLE_HEALER) --healers; else --dps; @@ -608,10 +608,10 @@ bool LFGMgr::CheckGroupRoles(LfgRolesMap &groles) guid = it->first; rol = it->second; - if (rol == ROL_NONE || rol == ROL_LEADER) + if (rol == ROLE_NONE || rol == ROLE_LEADER) return false; - if (rol & ROL_TANK) + if (rol & ROLE_TANK) if (!tank) { tguid = guid; @@ -619,13 +619,13 @@ bool LFGMgr::CheckGroupRoles(LfgRolesMap &groles) } else { - if (groles[tguid] == ROL_TANK) + if (groles[tguid] == ROLE_TANK) tguid = guid; - groles[tguid] -= ROL_TANK; + groles[tguid] -= ROLE_TANK; return CheckGroupRoles(groles); } - if (rol & ROL_HEALER) + if (rol & ROLE_HEALER) if (!healer) { hguid = guid; @@ -633,13 +633,13 @@ bool LFGMgr::CheckGroupRoles(LfgRolesMap &groles) } else { - if (groles[hguid] == ROL_HEALER) + if (groles[hguid] == ROLE_HEALER) hguid = guid; - groles[hguid] -= ROL_HEALER; + groles[hguid] -= ROLE_HEALER; return CheckGroupRoles(groles); } - if (rol & ROL_DAMAGE) + if (rol & ROLE_DAMAGE) if (damage < 3) { if (!damage) @@ -648,9 +648,9 @@ bool LFGMgr::CheckGroupRoles(LfgRolesMap &groles) } else { - if (groles[dguid] == ROL_DAMAGE) + if (groles[dguid] == ROLE_DAMAGE) dguid = guid; - groles[dguid] -= ROL_DAMAGE; + groles[dguid] -= ROLE_DAMAGE; return CheckGroupRoles(groles); } } |