diff options
author | Gacko <gacko28@gmx.de> | 2015-05-21 18:04:50 +0200 |
---|---|---|
committer | Gacko <gacko28@gmx.de> | 2015-05-21 18:04:50 +0200 |
commit | b9842fb8aa550e8e5f39180e0b9a0ce6ceaa35f8 (patch) | |
tree | c5146f5a7f67a632b50e8313ec0e9f02da5ac24f | |
parent | 266c09f8a95c06b758f1c9b0e2e52cafd451f757 (diff) |
Fix warnings.
-rw-r--r-- | src/server/game/Entities/Pet/Pet.cpp | 4 | ||||
-rw-r--r-- | src/server/game/Entities/Transport/Transport.cpp | 2 | ||||
-rw-r--r-- | src/server/game/Handlers/GroupHandler.cpp | 5 |
3 files changed, 5 insertions, 6 deletions
diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp index 82b55e23349..c8152e3ac36 100644 --- a/src/server/game/Entities/Pet/Pet.cpp +++ b/src/server/game/Entities/Pet/Pet.cpp @@ -39,8 +39,8 @@ Pet::Pet(Player* owner, PetType type) : Guardian(NULL, owner, true), m_usedTalentCount(0), m_removed(false), - m_petType(type), m_duration(0), m_groupUpdateMask(0), m_loading(false), - m_declinedname(NULL) + m_petType(type), m_duration(0), m_loading(false), m_declinedname(NULL), + m_groupUpdateMask(0) { ASSERT(GetOwner()); diff --git a/src/server/game/Entities/Transport/Transport.cpp b/src/server/game/Entities/Transport/Transport.cpp index 7034f7fbdc5..f449cec1eef 100644 --- a/src/server/game/Entities/Transport/Transport.cpp +++ b/src/server/game/Entities/Transport/Transport.cpp @@ -231,7 +231,7 @@ void Transport::Update(uint32 diff) sScriptMgr->OnTransportUpdate(this, diff); } -void Transport::DelayedUpdate(uint32 diff) +void Transport::DelayedUpdate(uint32 /*diff*/) { if (GetKeyFrames().size() <= 1) return; diff --git a/src/server/game/Handlers/GroupHandler.cpp b/src/server/game/Handlers/GroupHandler.cpp index 4aef42fed8d..eefe89fef74 100644 --- a/src/server/game/Handlers/GroupHandler.cpp +++ b/src/server/game/Handlers/GroupHandler.cpp @@ -629,10 +629,9 @@ void WorldSession::HandleInitiateRolePoll(WorldPackets::Party::InitiateRolePoll& if (!group) return; - if (!group->IsLeader(GetPlayer()->GetGUID()) && !group->IsAssistant(GetPlayer()->GetGUID())) - return; - ObjectGuid guid = GetPlayer()->GetGUID(); + if (!group->IsLeader(guid) && !group->IsAssistant(guid)) + return; WorldPackets::Party::RolePollInform rolePollInform; rolePollInform.From = GetPlayer()->GetGUID(); |