josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup into grid containers

Browse Source 
grid containers doesn't contains guid keys, so guid parameter is useless,
 removed find functions(anyway result of search would be null always)

--HG--
branch : trunk
This commit is contained in:
silver1ce
2010-02-03 05:23:32 +02:00
parent 23b1a482c9
commit 02acc66043
7 changed files with 44 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/GridNotifiers.h
-27
View File
@@ -180,33 +180,6 @@ namespace Trinity
void Visit(CreatureMapType &);
};
template<class T>
struct TRINITY_DLL_DECL ObjectAccessorNotifier
{
T *& i_object;
uint64 i_id;
ObjectAccessorNotifier(T * &obj, uint64 id) : i_object(obj), i_id(id)
{
i_object = NULL;
}
void Visit(GridRefManager<T> &m )
{
if( i_object == NULL )
{
GridRefManager<T> *iter = m.find(i_id);
if( iter != m.end() )
{
assert( iter->second != NULL );
i_object = iter->second;
}
}
}
template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {}
};
// SEARCHERS & LIST SEARCHERS & WORKERS
// WorldObject searchers & workers
src/game/Map.cpp
+10 -10
View File
@@ -249,18 +249,18 @@ template<class T>
void Map::AddToGrid(T* obj, NGridType *grid, Cell const& cell)
{
if(obj->m_isWorldObject)
(*grid)(cell.CellX(), cell.CellY()).template AddWorldObject<T>(obj, obj->GetGUID());
(*grid)(cell.CellX(), cell.CellY()).template AddWorldObject<T>(obj);
else
(*grid)(cell.CellX(), cell.CellY()).template AddGridObject<T>(obj, obj->GetGUID());
(*grid)(cell.CellX(), cell.CellY()).template AddGridObject<T>(obj);
}
template<>
void Map::AddToGrid(Creature* obj, NGridType *grid, Cell const& cell)
{
if(obj->m_isWorldObject)
(*grid)(cell.CellX(), cell.CellY()).AddWorldObject(obj, obj->GetGUID());
(*grid)(cell.CellX(), cell.CellY()).AddWorldObject(obj);
else
(*grid)(cell.CellX(), cell.CellY()).AddGridObject(obj, obj->GetGUID());
(*grid)(cell.CellX(), cell.CellY()).AddGridObject(obj);
obj->SetCurrentCell(cell);
}
@@ -269,9 +269,9 @@ template<class T>
void Map::RemoveFromGrid(T* obj, NGridType *grid, Cell const& cell)
{
if(obj->m_isWorldObject)
(*grid)(cell.CellX(), cell.CellY()).template RemoveWorldObject<T>(obj, obj->GetGUID());
(*grid)(cell.CellX(), cell.CellY()).template RemoveWorldObject<T>(obj);
else
(*grid)(cell.CellX(), cell.CellY()).template RemoveGridObject<T>(obj, obj->GetGUID());
(*grid)(cell.CellX(), cell.CellY()).template RemoveGridObject<T>(obj);
}
template<class T>
@@ -296,8 +296,8 @@ void Map::SwitchGridContainers(T* obj, bool on)
if(on)
{
grid.RemoveGridObject<T>(obj, obj->GetGUID());
grid.AddWorldObject<T>(obj, obj->GetGUID());
grid.RemoveGridObject<T>(obj);
grid.AddWorldObject<T>(obj);
/*if(!grid.RemoveGridObject<T>(obj, obj->GetGUID())
|| !grid.AddWorldObject<T>(obj, obj->GetGUID()))
{
@@ -306,8 +306,8 @@ void Map::SwitchGridContainers(T* obj, bool on)
}
else
{
grid.RemoveWorldObject<T>(obj, obj->GetGUID());
grid.AddGridObject<T>(obj, obj->GetGUID());
grid.RemoveWorldObject<T>(obj);
grid.AddGridObject<T>(obj);
/*if(!grid.RemoveWorldObject<T>(obj, obj->GetGUID())
|| !grid.AddGridObject<T>(obj, obj->GetGUID()))
{
src/game/ObjectAccessor.cpp
+2 -2
View File
@@ -314,12 +314,12 @@ ObjectAccessor::AddCorpsesToGrid(GridPair const& gridpair,GridType& grid,Map* ma
{
if (iter->second->GetInstanceId() == map->GetInstanceId())
{
grid.AddWorldObject(iter->second, iter->second->GetGUID());
grid.AddWorldObject(iter->second);
}
}
else
{
grid.AddWorldObject(iter->second, iter->second->GetGUID());
grid.AddWorldObject(iter->second);
}
}
}