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

trunk/src/game/Player.cpp

@@ -428 +428 @@
 
     m_isActive = true;
+
+    m_farsightVision = false;
 }
 
@@ -1292 +1294 @@
         RemoveGuardians();
 
+        // remove possession
+        if(isPossessing())
+            RemovePossess(false);
+        else
+            RemoveFarsightTarget();
+
         // save value before aura remove in Unit::setDeathState
         ressSpellId = GetUInt32Value(PLAYER_SELF_RES_SPELL);
@@ -1545 +1553 @@
         ((Player*)GetCharmer())->RemovePossess();
 
-    // The player was ported to another map and looses the duel immediately.
+    // Remove player's possession before teleporting
+    if (isPossessing())
+        RemovePossess(false);
+
+    // Empty vision list and clear farsight (if it hasn't already been cleared by RemovePossess) before teleporting
+    RemoveAllFromVision();
+    RemoveFarsightTarget();
+
+    // The player was ported to another map and looses the duel immediatly.
     // We have to perform this check before the teleport, otherwise the
     // ObjectAccessor won't find the flag.
@@ -1763 +1779 @@
         RemoveMiniPet();
         RemoveGuardians();
+        RemoveFarsightTarget();
     }
 
@@ -17294 +17311 @@
         return false;
 
-    // If the player is currently possessing, update visibility from the possessed unit's location
-    const Unit* target = isPossessing() ? GetCharm() : this;
+    // If the player is currently channeling vision, update visibility from the target unit's location
+    const WorldObject* target = GetFarsightTarget();
+    if (!target || !HasFarsightVision()) // Vision needs to be on the farsight target
+        target = this;
 
     // different visible distance checks
@@ -18744 +18763 @@
     SetPossessedTarget(target);
 
+    // Start channeling packets to possessor
+    target->AddPlayerToVision(this);
+
     target->SetUInt32Value(UNIT_FIELD_FACTIONTEMPLATE, getFaction());
     target->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
@@ -18749 +18771 @@
     target->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP_ATTACKABLE);
     SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE);
-    SetUInt64Value(PLAYER_FARSIGHT, target->GetGUID());
 
     if(target->GetTypeId() == TYPEID_UNIT)
     {
-        // Set target to active in the grid and place it in the world container to be picked up by all regular player cell visits
-        Map* map = target->GetMap();
-        map->SwitchGridContainers((Creature*)target, true);
-        target->setActive(true);
-
         ((Creature*)target)->InitPossessedAI(); // Initialize the possessed AI
         target->StopMoving();
@@ -18810 +18826 @@
     RemovePossessedTarget();
 
+    // Stop channeling packets back to possessor
+    target->RemovePlayerFromVision(this);
+
     if(target->GetTypeId() == TYPEID_PLAYER)
         ((Player*)target)->setFactionForRace(target->getRace());
     else if(target->GetTypeId() == TYPEID_UNIT)
     {
-        // Set creature to inactive in grid and place it back into the grid container
-        Map* map = target->GetMap();
-        target->setActive(false);
-        map->SwitchGridContainers((Creature*)target, false);
-
         if(((Creature*)target)->isPet())
         {
@@ -18832 +18846 @@
     target->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNKNOWN5);
     RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE);
-    SetUInt64Value(PLAYER_FARSIGHT, 0);
 
     // Remove pet spell action bar
@@ -18898 +18911 @@
 }
 
+WorldObject* Player::GetFarsightTarget() const
+{
+    // Players can have in farsight field another player's guid, a creature's guid, or a dynamic object's guid
+    if (uint64 guid = GetUInt64Value(PLAYER_FARSIGHT))
+        return (WorldObject*)ObjectAccessor::GetObjectByTypeMask(*this, guid, TYPEMASK_PLAYER | TYPEMASK_UNIT | TYPEMASK_DYNAMICOBJECT);
+    return NULL;
+}
+
+void Player::RemoveFarsightTarget()
+{
+    if (WorldObject* fTarget = GetFarsightTarget())
+    {
+        if (fTarget->isType(TYPEMASK_PLAYER | TYPEMASK_UNIT))
+            ((Unit*)fTarget)->RemovePlayerFromVision(this);
+    }
+    ClearFarsight();
+}
+
+void Player::ClearFarsight()
+{
+    if (GetUInt64Value(PLAYER_FARSIGHT))
+    {
+        SetUInt64Value(PLAYER_FARSIGHT, 0);
+        WorldPacket data(SMSG_CLEAR_FAR_SIGHT_IMMEDIATE, 0);
+        GetSession()->SendPacket(&data);
+    }
+}
+
+void Player::SetFarsightTarget(WorldObject* obj)
+{
+    if (!obj || !obj->isType(TYPEMASK_PLAYER | TYPEMASK_UNIT | TYPEMASK_DYNAMICOBJECT))
+        return;
+
+    // Remove the current target if there is one
+    RemoveFarsightTarget();
+
+    SetUInt64Value(PLAYER_FARSIGHT, obj->GetGUID());
+}
+
 bool Player::isAllowUseBattleGroundObject()
 {