Changeset 233 for trunk/src/game/GridNotifiers.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/GridNotifiers.cpp (modified) (6 diffs)

trunk/src/game/GridNotifiers.cpp

@@ -41 +41 @@
         iter->getSource()->UpdateVisibilityOf(&i_player);
         i_player.UpdateVisibilityOf(iter->getSource());
-        if (i_player.isPossessedByPlayer())
-            ((Player*)i_player.GetCharmer())->UpdateVisibilityOf(iter->getSource());
+
+        if (!i_player.GetSharedVisionList().empty())
+            for (SharedVisionList::const_iterator it = i_player.GetSharedVisionList().begin(); it != i_player.GetSharedVisionList().end(); ++it)
+                (*it)->UpdateVisibilityOf(iter->getSource());
     }
 }
@@ -149 +151 @@
         if (!i_dist || iter->getSource()->GetDistance(&i_source) <= i_dist)
         {
-            // Send packet to possessor
-            if (iter->getSource()->isPossessedByPlayer())
-                SendPacket((Player*)iter->getSource()->GetCharmer());
+            // Send packet to all who are sharing the player's vision
+            if (!iter->getSource()->GetSharedVisionList().empty())
+            {
+                SharedVisionList::const_iterator it = iter->getSource()->GetSharedVisionList().begin();
+                for ( ; it != iter->getSource()->GetSharedVisionList().end(); ++it)
+                    SendPacket(*it);
+            }
+
             VisitObject(iter->getSource());
         }
@@ -164 +171 @@
         if (!i_dist || iter->getSource()->GetDistance(&i_source) <= i_dist)
         {
-            // Send packet to possessor
-            if (iter->getSource()->isPossessedByPlayer())
-                SendPacket((Player*)iter->getSource()->GetCharmer());
+            // Send packet to all who are sharing the creature's vision
+            if (!iter->getSource()->GetSharedVisionList().empty())
+            {
+                SharedVisionList::const_iterator it = iter->getSource()->GetSharedVisionList().begin();
+                for ( ; it != iter->getSource()->GetSharedVisionList().end(); ++it)
+                    SendPacket(*it);
+            }
+        }
+    }
+}
+
+void
+Deliverer::Visit(DynamicObjectMapType &m)
+{
+    for (DynamicObjectMapType::iterator iter = m.begin(); iter != m.end(); ++iter)
+    {
+        if (IS_PLAYER_GUID(iter->getSource()->GetCasterGUID()))
+        {
+            // Send packet back to the caster if the caster has vision of dynamic object
+            Player* caster = (Player*)iter->getSource()->GetCaster();
+            if (caster->GetUInt64Value(PLAYER_FARSIGHT) == iter->getSource()->GetGUID() &&
+                (!i_dist || iter->getSource()->GetDistance(&i_source) <= i_dist))
+                SendPacket(caster);
         }
     }
@@ -176 +203 @@
     if (!plr)
         return;
+
+    // Don't send the packet to self if not supposed to
+    if (!i_toSelf && plr == &i_source)
+        return;
+
     // Don't send the packet to possesor if not supposed to
     if (!i_toPossessor && plr->isPossessing() && plr->GetCharmGUID() == i_source.GetGUID())
@@ -191 +223 @@
 MessageDeliverer::VisitObject(Player* plr)
 {
-    if (i_toSelf || plr != &i_source)
-        SendPacket(plr);
+    SendPacket(plr);
 }
 
@@ -198 +229 @@
 MessageDistDeliverer::VisitObject(Player* plr)
 {
-    if( (i_toSelf || plr != &i_source ) &&
-        (!i_ownTeamOnly || (i_source.GetTypeId() == TYPEID_PLAYER && plr->GetTeam() == ((Player&)i_source).GetTeam())) )
+    if( !i_ownTeamOnly || (i_source.GetTypeId() == TYPEID_PLAYER && plr->GetTeam() == ((Player&)i_source).GetTeam()) )
     {
         SendPacket(plr);