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

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.cpp (modified) (11 diffs)

trunk/src/game/Spell.cpp

@@ -95 +95 @@
 }
 
-void SpellCastTargets::setDestination(float x, float y, float z, bool send)
+void SpellCastTargets::setDestination(float x, float y, float z, bool send, uint32 mapId)
 {
     m_destX = x;
@@ -103 +103 @@
     if(send)
         m_targetMask |= TARGET_FLAG_DEST_LOCATION;
+    if(mapId)
+        m_mapId = mapId;
 }
 
@@ -1007 +1009 @@
             //if(!IsPositiveSpell(m_spellInfo->Id))
             {
-                unit->RemoveSpellsCausingAura(SPELL_AURA_MOD_STEALTH);
+                //do not remove feign death
+                unit->RemoveInterruptableAura(AURA_INTERRUPT_FLAG_STEALTH + AURA_INTERRUPT_FLAG_DAMAGE);
             }
         }
@@ -1013 +1016 @@
         {
             // for delayed spells ignore negative spells (after duel end) for friendly targets
+            // TODO: this cause soul transfer bugged
             if(m_spellInfo->speed > 0.0f && !IsPositiveSpell(m_spellInfo->Id))
             {
@@ -1250 +1254 @@
 void Spell::SearchAreaTarget(std::list<Unit*> &TagUnitMap, float radius, const uint32 &type, SpellTargets TargetType, uint32 entry)
 {
-    if(type == PUSH_DEST_CENTER && !m_targets.HasDest())
-    {
-        sLog.outError( "SPELL: cannot find destination for spell ID %u\n", m_spellInfo->Id );
-        return;
-    }
-
-    CellPair p(Trinity::ComputeCellPair(m_targets.m_destX, m_targets.m_destY));
+    float x, y;
+    if(type == PUSH_DEST_CENTER)
+    {
+        if(!m_targets.HasDest())
+        {
+            sLog.outError( "SPELL: cannot find destination for spell ID %u\n", m_spellInfo->Id );
+            return;
+        }
+        x = m_targets.m_destX;
+        y = m_targets.m_destY;
+    }
+    else
+    {
+        x = m_caster->GetPositionX();
+        y = m_caster->GetPositionY();
+    }
+
+    CellPair p(Trinity::ComputeCellPair(x, y));
     Cell cell(p);
     cell.data.Part.reserved = ALL_DISTRICT;
@@ -1436 +1451 @@
             if(SpellTargetPosition const* st = spellmgr.GetSpellTargetPosition(m_spellInfo->Id))
             {
-                if (st->target_mapId == m_caster->GetMapId())
+                //TODO: fix this check
+                if(m_spellInfo->Effect[0] == SPELL_EFFECT_TELEPORT_UNITS
+                    || m_spellInfo->Effect[1] == SPELL_EFFECT_TELEPORT_UNITS
+                    || m_spellInfo->Effect[2] == SPELL_EFFECT_TELEPORT_UNITS)
+                    m_targets.setDestination(st->target_X, st->target_Y, st->target_Z, true, st->target_mapId);
+                else if(st->target_mapId == m_caster->GetMapId())
                     m_targets.setDestination(st->target_X, st->target_Y, st->target_Z);
             }
             else
                 sLog.outError( "SPELL: unknown target coordinates for spell ID %u\n", m_spellInfo->Id );
+            break;
+        case TARGET_INNKEEPER_COORDINATES:
+            if(m_caster->GetTypeId() == TYPEID_PLAYER)
+                m_targets.setDestination(((Player*)m_caster)->m_homebindX,((Player*)m_caster)->m_homebindY,((Player*)m_caster)->m_homebindZ, true, ((Player*)m_caster)->m_homebindMapId);
             break;
 
@@ -1481 +1505 @@
         case TARGET_IN_FRONT_OF_CASTER:
         case TARGET_UNIT_CONE_ENEMY_UNKNOWN:
-        {
             switch(spellmgr.GetSpellExtraAttr(m_spellInfo->Id, SPELL_EXTRA_ATTR_CONE_TYPE))
             {
@@ -1494 +1517 @@
                     SearchAreaTarget(TagUnitMap, radius, PUSH_IN_LINE, SPELL_TARGETS_AOE_DAMAGE);
                     break;
-            }
-        }break;
+            }break;
         case TARGET_UNIT_CONE_ALLY:
-        {
             SearchAreaTarget(TagUnitMap, radius, PUSH_IN_FRONT, SPELL_TARGETS_FRIENDLY);
-        }break;
+            break;
 
         // nearby target
@@ -2000 +2021 @@
         case TARGET_DEST_DEST_RANDOM:
         {
-            if(!(m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION))
+            if(!m_targets.HasDest())
             {
                 sLog.outError("SPELL: no destination for spell ID %u\n", m_spellInfo->Id);
@@ -2014 +2035 @@
         }break;
         case TARGET_SELF2:
-            m_targets.m_hasDest = true;
+            if(!m_targets.HasDest())
+            {
+                sLog.outError("SPELL: no destination for spell ID %u\n", m_spellInfo->Id);
+                break;
+            }
             break;
         default:
@@ -2124 +2149 @@
     if ( !m_IsTriggeredSpell && isSpellBreakStealth(m_spellInfo) )
     {
-        m_caster->RemoveSpellsCausingAura(SPELL_AURA_MOD_STEALTH);
-        m_caster->RemoveSpellsCausingAura(SPELL_AURA_FEIGN_DEATH);
+        m_caster->RemoveInterruptableAura(AURA_INTERRUPT_FLAG_STEALTH);
     }