From 02acc6604362f577168536122596729243cbe400 Mon Sep 17 00:00:00 2001
From: silver1ce <none@none>
Date: Wed, 3 Feb 2010 05:23:32 +0200
Subject: cleanup into grid containers  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
---
 src/game/Map.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/game/Map.cpp')

diff --git a/src/game/Map.cpp b/src/game/Map.cpp
index 7a22645d639..d73833e30e2 100644
--- a/src/game/Map.cpp
+++ b/src/game/Map.cpp
@@ -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()))
         {
-- 
cgit v1.2.3