aboutsummaryrefslogtreecommitdiff
path: root/src/game/ArenaTeam.h
diff options
context:
space:
mode:
authormegamage <none@none>2009-02-09 22:08:06 -0600
committermegamage <none@none>2009-02-09 22:08:06 -0600
commitd696381f325278d2243ec5072e872ebfd38f8568 (patch)
tree7ecde5127884a93c7b7d5ff6a7d2bd62db553d20 /src/game/ArenaTeam.h
parent99c822621621ae0aa1ab1b28d3c1dc782ee9434a (diff)
[7250] Use bg type ids enum insted raw values and catch some bugs in result for fixing.
* Replace max bg type checks by DBC valid index check * Use in functions and fields BattlegroundTypeId type instead uint32 * Fixed wrong use bg queue ids instead bg type ids in queue update/remove function calls. Many bg have same raw values for type id and queue id but some can be affected by this bug: BATTLEGROUND_EY, BATTLEGROUND_SA, and all areans (with small arena/team size exceptions) * Move Battlemaster to bg type ids map fron ObjectMgr to BatteleGroundMgr. * Remobe redundent for header itself includes for BG headers. * Use Auction location enum instead raw valus. Author: VladimirMangos --HG-- branch : trunk
Diffstat (limited to 'src/game/ArenaTeam.h')
-rw-r--r--src/game/ArenaTeam.h13
1 files changed, 1 insertions, 12 deletions
diff --git a/src/game/ArenaTeam.h b/src/game/ArenaTeam.h
index cb53aedc0f4..4b839401e12 100644
--- a/src/game/ArenaTeam.h
+++ b/src/game/ArenaTeam.h
@@ -179,18 +179,7 @@ class ArenaTeam
return NULL;
}
- bool IsFighting() const
- {
- for (MemberList::const_iterator itr = members.begin(); itr != members.end(); ++itr)
- {
- if (Player *p = objmgr.GetPlayer(itr->guid))
- {
- if (p->GetMap()->IsBattleArena())
- return true;
- }
- }
- return false;
- }
+ bool IsFighting() const;
bool LoadArenaTeamFromDB(uint32 ArenaTeamId);
void LoadMembersFromDB(uint32 ArenaTeamId);