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

trunk/src/game/SpellHandler.cpp

@@ -353 +353 @@
         return;
 
-    // Remove possess/charm aura from the possessed/charmed as well
+    // Remove possess/charm/sight aura from the possessed/charmed as well
     // TODO: Remove this once the ability to cancel aura sets at once is implemented
-    if(_player->GetCharm())
+    if(_player->GetCharm() || _player->GetFarsightTarget())
     {
         for (int i = 0; i < 3; ++i)
@@ -361 +361 @@
             if (spellInfo->EffectApplyAuraName[i] == SPELL_AURA_MOD_POSSESS ||
                 spellInfo->EffectApplyAuraName[i] == SPELL_AURA_MOD_POSSESS_PET ||
-                spellInfo->EffectApplyAuraName[i] == SPELL_AURA_MOD_CHARM)
+                spellInfo->EffectApplyAuraName[i] == SPELL_AURA_MOD_CHARM ||
+                spellInfo->EffectApplyAuraName[i] == SPELL_AURA_BIND_SIGHT)
             {
                 _player->RemoveAurasDueToSpellByCancel(spellId);
-                _player->GetCharm()->RemoveAurasDueToSpellByCancel(spellId);
+                if (_player->GetCharm())
+                    _player->GetCharm()->RemoveAurasDueToSpellByCancel(spellId);
+                else if (_player->GetFarsightTarget()->GetTypeId() != TYPEID_DYNAMICOBJECT)
+                    ((Unit*)_player->GetFarsightTarget())->RemoveAurasDueToSpellByCancel(spellId);
                 return;
             }
@@ -465 +469 @@
 
     Creature* totem = ObjectAccessor::GetCreature(*_player,_player->m_TotemSlot[slotId]);
-    if(totem && totem->isTotem())
+    // Don't unsummon sentry totem
+    if(totem && totem->isTotem() && totem->GetEntry() != SENTRY_TOTEM_ENTRY)
         ((Totem*)totem)->UnSummon();
 }