From a50eec9439cb5003546a6abe9d8b8a9cb3b5ce4c Mon Sep 17 00:00:00 2001 From: Shauren Date: Thu, 30 May 2013 21:23:11 +0200 Subject: Fixed merge errors --- src/server/game/Battlegrounds/ArenaTeam.h | 2 ++ src/server/scripts/Commands/cs_misc.cpp | 6 ------ 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/server/game/Battlegrounds/ArenaTeam.h b/src/server/game/Battlegrounds/ArenaTeam.h index e25fbba235b..197e6af68c6 100644 --- a/src/server/game/Battlegrounds/ArenaTeam.h +++ b/src/server/game/Battlegrounds/ArenaTeam.h @@ -141,6 +141,8 @@ class ArenaTeam size_t GetMembersSize() const { return Members.size(); } bool Empty() const { return Members.empty(); } + MemberList::iterator m_membersBegin() { return Members.begin(); } + MemberList::iterator m_membersEnd() { return Members.end(); } bool IsMember(uint64 guid) const; ArenaTeamMember* GetMember(uint64 guid); diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp index 46eda11bfed..10b54d7ad39 100644 --- a/src/server/scripts/Commands/cs_misc.cpp +++ b/src/server/scripts/Commands/cs_misc.cpp @@ -1717,12 +1717,6 @@ public: { Field* fields = result3->Fetch(); xptotal = fields[0].GetUInt32(); - case RACE_GOBLIN: - raceStr = "Goblin"; - break; - case RACE_WORGEN: - raceStr = "Worgen"; - break; } // Can be used to query data from Characters database -- cgit v1.2.3