diff options
| author | Spp <spp@jorge.gr> | 2013-01-02 13:30:51 +0100 |
|---|---|---|
| committer | Spp <spp@jorge.gr> | 2013-01-02 13:30:51 +0100 |
| commit | aed36a8375538dfb7ebe6da4c32c012a95dc14c6 (patch) | |
| tree | eca30ab36e47bcedc1f0380f0f8a600326cac41f /src/server/game/DungeonFinding/LFGQueue.cpp | |
| parent | 91f8ca32445f839e36ec699627a12781907950c9 (diff) | |
| parent | ebd14b4f01cc64a2a488bdbb1046897cc4da8e9a (diff) | |
Merge branch 'master' into 4.3.4
Conflicts:
dep/libmpq/CMakeLists.txt
src/server/game/AI/EventAI/CreatureEventAI.cpp
src/server/game/AI/EventAI/CreatureEventAI.h
src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
src/server/game/AI/EventAI/CreatureEventAIMgr.h
src/server/game/Entities/Creature/Creature.h
src/server/game/Entities/Item/ItemPrototype.h
src/server/game/Entities/Object/ObjectDefines.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Handlers/ReferAFriendHandler.cpp
src/server/game/Movement/Spline/MoveSplineInit.h
src/server/game/World/World.h
src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
src/server/scripts/EasternKingdoms/boss_kruul.cpp
src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
src/server/scripts/OutdoorPvP/OutdoorPvPEP.h
src/server/shared/Database/Implementation/CharacterDatabase.cpp
src/server/shared/Database/Implementation/CharacterDatabase.h
src/server/shared/Database/Implementation/WorldDatabase.cpp
Diffstat (limited to 'src/server/game/DungeonFinding/LFGQueue.cpp')
| -rw-r--r-- | src/server/game/DungeonFinding/LFGQueue.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/DungeonFinding/LFGQueue.cpp b/src/server/game/DungeonFinding/LFGQueue.cpp index bfcf17dc270..dae789b2eb4 100644 --- a/src/server/game/DungeonFinding/LFGQueue.cpp +++ b/src/server/game/DungeonFinding/LFGQueue.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/> + * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> * * This program is free software you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -358,7 +358,7 @@ LfgCompatibility LFGQueue::CheckCompatibility(LfgGuidList check) // Store group so we don't need to call Mgr to get it later (if it's player group will be 0 otherwise would have joined as group) for (LfgRolesMap::const_iterator it2 = itQueue->second.roles.begin(); it2 != itQueue->second.roles.end(); ++it2) - proposalGroups[it2->first] = IS_GROUP(itQueue->first) ? itQueue->first : 0; + proposalGroups[it2->first] = IS_GROUP_GUID(itQueue->first) ? itQueue->first : 0; numPlayers += itQueue->second.roles.size(); @@ -601,7 +601,7 @@ std::string LFGQueue::DumpQueueInfo() const for (LfgGuidList::const_iterator it = queue.begin(); it != queue.end(); ++it) { uint64 guid = *it; - if (IS_GROUP(guid)) + if (IS_GROUP_GUID(guid)) { groups++; playersInGroup += sLFGMgr->GetPlayerCount(guid); |