Changeset 142 for trunk/src/game/Spell.h

Timestamp:

11/19/08 13:40:02 (17 years ago)

Author:

yumileroy

Message:

[svn] Fix teleport spells.
Fix cone spells.
Use interrupt_aura_flag to remove stealth/invisible/feign death auras.

Original author: megamage
Date: 2008-11-01 15:08:12-05:00

Files:

• trunk/src/game/Spell.h (modified) (9 diffs)

trunk/src/game/Spell.h

@@ -112 +112 @@
             //m_srcZ = target.m_srcZ;
 
+            m_mapId = 0;
             m_destX = target.m_destX;
             m_destY = target.m_destY;
@@ -127 +128 @@
         Unit *getUnitTarget() const { return m_unitTarget; }
         void setUnitTarget(Unit *target);
-        void setDestination(float x, float y, float z, bool send = true);
+        void setDestination(float x, float y, float z, bool send = true, uint32 mapId = 0);
         void setDestination(Unit *target, bool send = true);
 
@@ -155 +156 @@
 
         float m_srcX, m_srcY, m_srcZ;
+        uint32 m_mapId;
         float m_destX, m_destY, m_destZ;
         bool m_hasDest;
@@ -549 +551 @@
         float i_radius;
         SpellTargets i_TargetType;
-        Unit* i_originalCaster;
+        Unit* i_caster;
         uint32 i_entry;
 
@@ -556 +558 @@
             : i_data(&data), i_spell(spell), i_push_type(type), i_radius(radius), i_TargetType(TargetType), i_entry(entry)
         {
-            i_originalCaster = spell.GetCaster();
+            i_caster = spell.GetCaster();
         }
 
@@ -563 +565 @@
             assert(i_data);
 
-            if(!i_originalCaster)
+            if(!i_caster)
                 return;
 
@@ -574 +576 @@
                 {
                     case SPELL_TARGETS_FRIENDLY:
-                        if (!itr->getSource()->isTargetableForAttack() || !i_originalCaster->IsFriendlyTo( itr->getSource() ))
+                        if (!itr->getSource()->isTargetableForAttack() || !i_caster->IsFriendlyTo( itr->getSource() ))
                             continue;
                         break;
@@ -584 +586 @@
                             continue;
 
-                        Unit* check = i_originalCaster->GetCharmerOrOwnerOrSelf();
+                        Unit* check = i_caster->GetCharmerOrOwnerOrSelf();
 
                         if( check->GetTypeId()==TYPEID_PLAYER )
@@ -608 +610 @@
                 {
                     case PUSH_IN_FRONT:
-                        if(i_spell.GetCaster()->isInFront((Unit*)(itr->getSource()), i_radius, M_PI/3 ))
+                        if(i_caster->isInFront((Unit*)(itr->getSource()), i_radius, M_PI/3 ))
                             i_data->push_back(itr->getSource());
                         break;
                     case PUSH_IN_BACK:
-                        if(i_spell.GetCaster()->isInBack((Unit*)(itr->getSource()), i_radius, M_PI/3 ))
+                        if(i_caster->isInBack((Unit*)(itr->getSource()), i_radius, M_PI/3 ))
                             i_data->push_back(itr->getSource());
                         break;
                     case PUSH_IN_LINE:
-                        if(i_spell.GetCaster()->isInLine((Unit*)(itr->getSource()), i_radius ))
+                        if(i_caster->isInLine((Unit*)(itr->getSource()), i_radius ))
                             i_data->push_back(itr->getSource());
                         break;
                     case PUSH_SELF_CENTER:
-                        if(i_spell.GetCaster()->IsWithinDistInMap((Unit*)(itr->getSource()), i_radius))
+                        if(i_caster->IsWithinDistInMap((Unit*)(itr->getSource()), i_radius))
                             i_data->push_back(itr->getSource());
                         break;