diff options
| author | Shauren <shauren.trinity@gmail.com> | 2014-09-16 21:50:01 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2014-09-16 21:50:01 +0200 |
| commit | 7d1d55124c1e289748d2afefae896c97f710e57b (patch) | |
| tree | dcae6831f97fa1d353233fa7367800af1c4caa98 /src/server/game/DungeonFinding/LFGPlayerData.cpp | |
| parent | 6810a4469ebe6600be2f8649e917110a17ce27f3 (diff) | |
| parent | 9b933b4a291e377d4ae124eb8e3d2ba74b37f34f (diff) | |
Merge branch 'ObjectGuid' of https://github.com/TrinityCore/TrinityCore
Conflicts:
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Scripting/MapScripts.cpp
src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp
src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp
src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp
src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp
src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp
src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp
src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
Diffstat (limited to 'src/server/game/DungeonFinding/LFGPlayerData.cpp')
| -rw-r--r-- | src/server/game/DungeonFinding/LFGPlayerData.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/DungeonFinding/LFGPlayerData.cpp b/src/server/game/DungeonFinding/LFGPlayerData.cpp index 84b93543d7f..df9909fc4ce 100644 --- a/src/server/game/DungeonFinding/LFGPlayerData.cpp +++ b/src/server/game/DungeonFinding/LFGPlayerData.cpp @@ -21,7 +21,7 @@ namespace lfg { LfgPlayerData::LfgPlayerData(): m_State(LFG_STATE_NONE), m_OldState(LFG_STATE_NONE), - m_Team(0), m_Group(0), m_Roles(0), m_Comment("") + m_Team(0), m_Group(), m_Roles(0), m_Comment("") { } LfgPlayerData::~LfgPlayerData() { } @@ -59,7 +59,7 @@ void LfgPlayerData::SetTeam(uint8 team) m_Team = team; } -void LfgPlayerData::SetGroup(uint64 group) +void LfgPlayerData::SetGroup(ObjectGuid group) { m_Group = group; } @@ -94,7 +94,7 @@ uint8 LfgPlayerData::GetTeam() const return m_Team; } -uint64 LfgPlayerData::GetGroup() const +ObjectGuid LfgPlayerData::GetGroup() const { return m_Group; } |