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

5 files changed, 29 insertions, 10 deletions

diff --git a/src/server/game/Grids/Grid.h b/src/server/game/Grids/Grid.h
index 448c4cb35fd..7e66cf1080a 100755
--- a/src/server/game/Grids/Grid.h
+++ b/src/server/game/Grids/Grid.h
@@ -100,7 +100,12 @@ class Grid
 
         /** Returns the number of object within the grid.
          */
-        unsigned int ActiveObjectsInGrid(void) const { return /*m_activeGridObjects.size()+*/i_objects.template Count<ACTIVE_OBJECT>(); }
+        //unsigned int ActiveObjectsInGrid(void) const { return i_objects.template Count<ACTIVE_OBJECT>(); }
+        template<class T>
+        uint32 GetWorldObjectCountInGrid() const
+        {
+            return i_objects.template Count<T>();
+        }
 
         /** Inserts a container type object into the grid.
          */
diff --git a/src/server/game/Grids/GridStates.cpp b/src/server/game/Grids/GridStates.cpp
index 5f88516c9ac..4e63388c356 100755
--- a/src/server/game/Grids/GridStates.cpp
+++ b/src/server/game/Grids/GridStates.cpp
@@ -31,7 +31,7 @@ void ActiveState::Update(Map &m, NGridType &grid, GridInfo & info, const uint32
     info.UpdateTimeTracker(t_diff);
     if (info.getTimeTracker().Passed())
     {
-        if (grid.ActiveObjectsInGrid() == 0 && !m.ActiveObjectsNearGrid(grid))
+        if (!grid.GetWorldObjectCountInNGrid<Player>() && !m.ActiveObjectsNearGrid(grid))
         {
             ObjectGridStoper worker;
             TypeContainerVisitor<ObjectGridStoper, GridTypeMapContainer> visitor(worker);
diff --git a/src/server/game/Grids/NGrid.h b/src/server/game/Grids/NGrid.h
index 97a47f7d272..c87fd7e6129 100755
--- a/src/server/game/Grids/NGrid.h
+++ b/src/server/game/Grids/NGrid.h
@@ -158,14 +158,28 @@ class NGrid
             GetGridType(x, y).Visit(visitor);
         }
 
-        unsigned int ActiveObjectsInGrid(void) const
+        //This gets the player count in grid
+        //I disable this to avoid confusion (active object usually means something else)
+        /*
+        uint32 GetActiveObjectCountInGrid() const
         {
-            unsigned int count=0;
-            for (unsigned int x=0; x < N; ++x)
-                for (unsigned int y=0; y < N; ++y)
+            uint32 count = 0;
+            for (uint32 x = 0; x < N; ++x)
+                for (uint32 y = 0; y < N; ++y)
                     count += i_cells[x][y].ActiveObjectsInGrid();
             return count;
         }
+        */
+
+        template<class T>
+        uint32 GetWorldObjectCountInNGrid() const
+        {
+            uint32 count = 0;
+            for (uint32 x = 0; x < N; ++x)
+                for (uint32 y = 0; y < N; ++y)
+                    count += i_cells[x][y].template GetWorldObjectCountInGrid<T>();
+            return count;
+        }
 
     private:
         uint32 i_gridId;
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);
     };