aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Maps
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2017-05-13 19:37:33 +0200
committerShauren <shauren.trinity@gmail.com>2017-05-13 19:37:33 +0200
commit9299e9bde087af7e5d777d5a55a3b79d2b63c48e (patch)
tree4d3e436ae21faf28154be8a70fd7d23c1b7692f0 /src/server/game/Maps
parent229c78b5a38dc58e14f4912de49437b68341452b (diff)
Core/Grids: Ported cmangos/mangos-wotlk@ea99457e50790acde8928aa0f3dc4a9c096b4a8c
Diffstat (limited to 'src/server/game/Maps')
-rw-r--r--src/server/game/Maps/Map.cpp22
-rw-r--r--src/server/game/Maps/Map.h59
2 files changed, 0 insertions, 81 deletions
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
index 10fcd8288fc..ac2330e6f1e 100644
--- a/src/server/game/Maps/Map.cpp
+++ b/src/server/game/Maps/Map.cpp
@@ -2829,28 +2829,6 @@ char const* Map::GetMapName() const
return i_mapEntry ? i_mapEntry->MapName->Str[sWorld->GetDefaultDbcLocale()] : "UNNAMEDMAP\x0";
}
-void Map::UpdateObjectVisibility(WorldObject* obj, Cell cell, CellCoord cellpair)
-{
- cell.SetNoCreate();
- Trinity::VisibleChangesNotifier notifier(*obj);
- TypeContainerVisitor<Trinity::VisibleChangesNotifier, WorldTypeMapContainer > player_notifier(notifier);
- cell.Visit(cellpair, player_notifier, *this, *obj, obj->GetVisibilityRange());
-}
-
-void Map::UpdateObjectsVisibilityFor(Player* player, Cell cell, CellCoord cellpair)
-{
- Trinity::VisibleNotifier notifier(*player);
-
- cell.SetNoCreate();
- TypeContainerVisitor<Trinity::VisibleNotifier, WorldTypeMapContainer > world_notifier(notifier);
- TypeContainerVisitor<Trinity::VisibleNotifier, GridTypeMapContainer > grid_notifier(notifier);
- cell.Visit(cellpair, world_notifier, *this, *player->m_seer, player->GetSightRange());
- cell.Visit(cellpair, grid_notifier, *this, *player->m_seer, player->GetSightRange());
-
- // send data
- notifier.SendToSelf();
-}
-
void Map::SendInitSelf(Player* player)
{
TC_LOG_DEBUG("maps", "Creating player data for himself %s", player->GetGUID().ToString().c_str());
diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h
index 0854090bc3f..263d65788e8 100644
--- a/src/server/game/Maps/Map.h
+++ b/src/server/game/Maps/Map.h
@@ -416,9 +416,6 @@ class TC_GAME_API Map : public GridRefManager<NGridType>
void AddObjectToSwitchList(WorldObject* obj, bool on);
virtual void DelayedUpdate(const uint32 diff);
- void UpdateObjectVisibility(WorldObject* obj, Cell cell, CellCoord cellpair);
- void UpdateObjectsVisibilityFor(Player* player, Cell cell, CellCoord cellpair);
-
void resetMarkedCells() { marked_cells.reset(); }
bool isCellMarked(uint32 pCellId) { return marked_cells.test(pCellId); }
void markCell(uint32 pCellId) { marked_cells.set(pCellId); }
@@ -448,10 +445,6 @@ class TC_GAME_API Map : public GridRefManager<NGridType>
void RemoveFromActive(T* obj);
template<class T> void SwitchGridContainers(T* obj, bool on);
- template<class NOTIFIER> void VisitAll(const float &x, const float &y, float radius, NOTIFIER &notifier);
- template<class NOTIFIER> void VisitFirstFound(const float &x, const float &y, float radius, NOTIFIER &notifier);
- template<class NOTIFIER> void VisitWorld(const float &x, const float &y, float radius, NOTIFIER &notifier);
- template<class NOTIFIER> void VisitGrid(const float &x, const float &y, float radius, NOTIFIER &notifier);
CreatureGroupHolderType CreatureGroupHolder;
void UpdateIteratorBack(Player* player);
@@ -835,56 +828,4 @@ inline void Map::Visit(Cell const& cell, TypeContainerVisitor<T, CONTAINER>& vis
getNGrid(x, y)->VisitGrid(cell_x, cell_y, visitor);
}
}
-
-template<class NOTIFIER>
-inline void Map::VisitAll(float const& x, float const& y, float radius, NOTIFIER& notifier)
-{
- CellCoord p(Trinity::ComputeCellCoord(x, y));
- Cell cell(p);
- cell.SetNoCreate();
-
- TypeContainerVisitor<NOTIFIER, WorldTypeMapContainer> world_object_notifier(notifier);
- cell.Visit(p, world_object_notifier, *this, radius, x, y);
- TypeContainerVisitor<NOTIFIER, GridTypeMapContainer > grid_object_notifier(notifier);
- cell.Visit(p, grid_object_notifier, *this, radius, x, y);
-}
-
-// should be used with Searcher notifiers, tries to search world if nothing found in grid
-template<class NOTIFIER>
-inline void Map::VisitFirstFound(const float &x, const float &y, float radius, NOTIFIER &notifier)
-{
- CellCoord p(Trinity::ComputeCellCoord(x, y));
- Cell cell(p);
- cell.SetNoCreate();
-
- TypeContainerVisitor<NOTIFIER, WorldTypeMapContainer> world_object_notifier(notifier);
- cell.Visit(p, world_object_notifier, *this, radius, x, y);
- if (!notifier.i_object)
- {
- TypeContainerVisitor<NOTIFIER, GridTypeMapContainer > grid_object_notifier(notifier);
- cell.Visit(p, grid_object_notifier, *this, radius, x, y);
- }
-}
-
-template<class NOTIFIER>
-inline void Map::VisitWorld(const float &x, const float &y, float radius, NOTIFIER &notifier)
-{
- CellCoord p(Trinity::ComputeCellCoord(x, y));
- Cell cell(p);
- cell.SetNoCreate();
-
- TypeContainerVisitor<NOTIFIER, WorldTypeMapContainer> world_object_notifier(notifier);
- cell.Visit(p, world_object_notifier, *this, radius, x, y);
-}
-
-template<class NOTIFIER>
-inline void Map::VisitGrid(const float &x, const float &y, float radius, NOTIFIER &notifier)
-{
- CellCoord p(Trinity::ComputeCellCoord(x, y));
- Cell cell(p);
- cell.SetNoCreate();
-
- TypeContainerVisitor<NOTIFIER, GridTypeMapContainer > grid_object_notifier(notifier);
- cell.Visit(p, grid_object_notifier, *this, radius, x, y);
-}
#endif