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

trunk/src/game/Unit.cpp

@@ -828 +828 @@
             he->DuelComplete(DUEL_INTERUPTED);
         }
-
-        // Possessed unit died, restore control to possessor
-        pVictim->UnpossessSelf(false);
-
-        // Possessor died, remove possession
-        if(pVictim->GetTypeId() == TYPEID_PLAYER && pVictim->isPossessing())
-            ((Player*)pVictim)->RemovePossess(false);
 
         // battleground things (do this at the end, so the death state flag will be properly set to handle in the bg->handlekill)
@@ -7184 +7177 @@
 }
 
+void Unit::AddPlayerToVision(Player* plr) 
+{ 
+    if (m_sharedVision.empty() && GetTypeId() == TYPEID_UNIT)
+    {
+        setActive(true);
+        GetMap()->SwitchGridContainers((Creature*)this, true);
+    }
+    m_sharedVision.push_back(plr);
+    plr->SetFarsightTarget(this);
+}
+
+void Unit::RemovePlayerFromVision(Player* plr) 
+{ 
+    m_sharedVision.remove(plr); 
+    if (m_sharedVision.empty() && GetTypeId() == TYPEID_UNIT)
+    {
+        setActive(false);
+        GetMap()->SwitchGridContainers((Creature*)this, false);
+    }
+    plr->ClearFarsight();
+}
+
+void Unit::RemoveAllFromVision()
+{
+    while (!m_sharedVision.empty())
+    {
+        Player* plr = *m_sharedVision.begin();
+        m_sharedVision.erase(m_sharedVision.begin());
+        plr->ClearFarsight();
+    }
+}
+
 void Unit::UncharmSelf()
 {
@@ -8936 +8961 @@
         UnsummonAllTotems();
 
+        // Possessed unit died, restore control to possessor
+        UnpossessSelf(false);
+        RemoveAllFromVision();
+
         ModifyAuraState(AURA_STATE_HEALTHLESS_20_PERCENT, false);
         ModifyAuraState(AURA_STATE_HEALTHLESS_35_PERCENT, false);
@@ -9757 +9786 @@
 
         UnpossessSelf(false);
+        RemoveAllFromVision();
     }
     RemoveFromWorld();
 }
+
+
 
 CharmInfo* Unit::InitCharmInfo(Unit *charm)