Changeset 233 for trunk/src/game/Map.cpp

Timestamp:

11/19/08 13:49:07 (17 years ago)

Author:

yumileroy

Message:

[svn] * Reimplemented packet/update forwarding in more generic way
* Implemented far sight spells (Far Sight, Eagle Eye, etc) at unlimited range and properly forward packets
* Implemented bind vision spells (Mind Vision, etc) to forward packets at unlimited distance
* Implemented Sentry Totem (both vision switching/forwarding and alerting)
* Other misc possession fixes
* Added .bindsight and .unbindsight commands

Please test out the above spells (including Mind Control) and report any issues on the forums.

Original author: gvcoman
Date: 2008-11-14 20:40:35-06:00

Files:

• trunk/src/game/Map.cpp (modified) (2 diffs)

trunk/src/game/Map.cpp

@@ -316 +316 @@
     CellPair pair = Trinity::ComputeCellPair(obj->GetPositionX(), obj->GetPositionY());
     Cell cell(pair);
-    NGridType *grid = getNGrid(cell.GridX(), cell.GridY());
+    NGridType *ngrid = getNGrid(cell.GridX(), cell.GridY());
+    GridType &grid = (*ngrid)(cell.CellX(), cell.CellY());
 
     if (active)
     {
-        (*grid)(cell.CellX(), cell.CellY()).RemoveGridObject<T>(obj, obj->GetGUID());
-        (*grid)(cell.CellX(), cell.CellY()).AddWorldObject<T>(obj, obj->GetGUID());
+        if (!grid.GetWorldObject(obj->GetGUID(), obj))
+        {
+            grid.RemoveGridObject<T>(obj, obj->GetGUID());
+            grid.AddWorldObject<T>(obj, obj->GetGUID());
+        }
     } else
     {
-        (*grid)(cell.CellX(), cell.CellY()).RemoveWorldObject<T>(obj, obj->GetGUID());
-        (*grid)(cell.CellX(), cell.CellY()).AddGridObject<T>(obj, obj->GetGUID());
+        if (!grid.GetGridObject(obj->GetGUID(), obj))
+        {
+            grid.RemoveWorldObject<T>(obj, obj->GetGUID());
+            grid.AddGridObject<T>(obj, obj->GetGUID());
+        }
     }
 }
@@ -331 +338 @@
 template void Map::SwitchGridContainers(Creature *, bool);
 template void Map::SwitchGridContainers(Corpse *, bool);
+template void Map::SwitchGridContainers(DynamicObject *, bool);
 
 template<class T>