diff options
| author | Shauren <shauren.trinity@gmail.com> | 2013-08-01 18:03:48 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2013-08-01 18:03:48 +0200 |
| commit | 3814bbdd46f33d20dfde27c1e1bc38e9c6183469 (patch) | |
| tree | 2b727b634337a6796faedfbe0d16b6741f8d7bde /src/server/game | |
| parent | b8b21ce1f8930a458faf2fb131747807b5aa6a24 (diff) | |
Core/Misc: Fixed compile warnings
Diffstat (limited to 'src/server/game')
| -rw-r--r-- | src/server/game/DungeonFinding/LFGMgr.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Entities/Object/Object.cpp | 4 | ||||
| -rw-r--r-- | src/server/game/Spells/Spell.cpp | 22 |
3 files changed, 1 insertions, 27 deletions
diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp index a1995058ec3..af51e91ad1b 100644 --- a/src/server/game/DungeonFinding/LFGMgr.cpp +++ b/src/server/game/DungeonFinding/LFGMgr.cpp @@ -774,7 +774,7 @@ void LFGMgr::UpdateRoleCheck(uint64 gguid, uint64 guid /* = 0 */, uint8 roles /* if (roleCheck.state == LFG_ROLECHECK_MISSING_ROLE || roleCheck.state == LFG_ROLECHECK_WRONG_ROLES) joinResult = LFG_JOIN_ROLE_CHECK_FAILED; - LfgJoinResultData joinData = LfgJoinResultData(LFG_JOIN_FAILED, roleCheck.state); + LfgJoinResultData joinData = LfgJoinResultData(joinResult, roleCheck.state); for (LfgRolesMap::const_iterator it = roleCheck.roles.begin(); it != roleCheck.roles.end(); ++it) { uint64 pguid = it->first; diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 9ee58d62194..e8bbf09eab1 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -184,13 +184,9 @@ void Object::BuildCreateUpdateBlockForPlayer(UpdateData* data, Player* target) c uint8 updateType = UPDATETYPE_CREATE_OBJECT; uint16 flags = m_updateFlag; - uint32 valCount = m_valuesCount; - /** lower flag1 **/ if (target == this) // building packet for yourself flags |= UPDATEFLAG_SELF; - else if (GetTypeId() == TYPEID_PLAYER) - valCount = PLAYER_END_NOT_SELF; switch (GetGUIDHigh()) { diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 3734585be03..9db018820ae 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -5087,28 +5087,6 @@ SpellCastResult Spell::CheckCast(bool strict) if (castResult != SPELL_CAST_OK) return castResult; - bool hasDispellableAura = false; - bool hasNonDispelEffect = false; - uint32 dispelMask = 0; - for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) - { - if (m_spellInfo->Effects[i].Effect == SPELL_EFFECT_DISPEL) - { - if (m_spellInfo->Effects[i].IsTargetingArea() || m_spellInfo->AttributesEx & SPELL_ATTR1_MELEE_COMBAT_START) - { - hasDispellableAura = true; - break; - } - - dispelMask |= SpellInfo::GetDispelMask(DispelType(m_spellInfo->Effects[i].MiscValue)); - } - else if (m_spellInfo->Effects[i].IsEffect()) - { - hasNonDispelEffect = true; - break; - } - } - for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) { // for effects of spells that have only one target |
