Merge branch 'master' into 4.x and some warning fixes

2 files changed, 4 insertions, 4 deletions

diff --git a/src/server/game/Grids/Notifiers/GridNotifiers.cpp b/src/server/game/Grids/Notifiers/GridNotifiers.cpp
index ca61a82e840..99d402b4add 100755
--- a/src/server/game/Grids/Notifiers/GridNotifiers.cpp
+++ b/src/server/game/Grids/Notifiers/GridNotifiers.cpp
@@ -344,7 +344,7 @@ bool AnyDeadUnitObjectInRangeCheck::operator()(Creature* u)
 bool AnyDeadUnitSpellTargetInRangeCheck::operator()(Player* u)
 {
     return AnyDeadUnitObjectInRangeCheck::operator()(u)
-        && i_spellInfo->CheckTarget(i_searchObj, u, true)
+        && (i_spellInfo->CheckTarget(i_searchObj, u, true) == SPELL_CAST_OK)
         && i_searchObj->IsTargetMatchingCheck(u, i_check);
 }
 
@@ -352,14 +352,14 @@ bool AnyDeadUnitSpellTargetInRangeCheck::operator()(Corpse* u)
 {
     Player* owner = ObjectAccessor::FindPlayer(u->GetOwnerGUID());
     return owner && AnyDeadUnitObjectInRangeCheck::operator()(u)
-        && i_spellInfo->CheckTarget(i_searchObj, owner, true)
+        && (i_spellInfo->CheckTarget(i_searchObj, owner, true) == SPELL_CAST_OK)
         && i_searchObj->IsTargetMatchingCheck(owner, i_check);
 }
 
 bool AnyDeadUnitSpellTargetInRangeCheck::operator()(Creature* u)
 {
     return AnyDeadUnitObjectInRangeCheck::operator()(u)
-        && i_spellInfo->CheckTarget(i_searchObj, u, true)
+        && (i_spellInfo->CheckTarget(i_searchObj, u, true) == SPELL_CAST_OK)
         && i_searchObj->IsTargetMatchingCheck(u, i_check);
 }
 
diff --git a/src/server/game/Grids/Notifiers/GridNotifiers.h b/src/server/game/Grids/Notifiers/GridNotifiers.h
index bdabc7a4bcc..0e9cf082573 100755
--- a/src/server/game/Grids/Notifiers/GridNotifiers.h
+++ b/src/server/game/Grids/Notifiers/GridNotifiers.h
@@ -43,7 +43,7 @@ namespace Trinity
         std::set<Unit*> i_visibleNow;
         Player::ClientGUIDs vis_guids;
 
-        VisibleNotifier(Player &player) : i_player(player), vis_guids(player.m_clientGUIDs), i_data(player.GetMapId()) {}
+        VisibleNotifier(Player &player) : i_player(player), i_data(player.GetMapId()), vis_guids(player.m_clientGUIDs) {}
         template<class T> void Visit(GridRefManager<T> &m);
         void SendToSelf(void);
     };