Fixed merge errors
This commit is contained in:
1 parent
adb78862da
commit
a50eec9439
2 files changed
+2
-6
No files matched your search
@@ -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);
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in new issue
Block a user