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

Timestamp:

11/19/08 13:36:37 (17 years ago)

Author:

yumileroy

Message:

[svn] Continue the work of rewriting spell target selection functions (warning: this may cause some spells broken).
Add some spell_script_target.
Delete some workaround in scripts (since core provides spell support now).

Original author: megamage
Date: 2008-10-25 10:37:28-05:00

Files:

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

trunk/src/game/Spell.h

@@ -76 +76 @@
     PUSH_SELF_CENTER,
     PUSH_DEST_CENTER,
-    PUSH_TARGET_CENTER
 };
 
@@ -83 +82 @@
 namespace Trinity
 {
-    struct SpellNotifierPlayer;
     struct SpellNotifierCreatureAndPlayer;
 }
@@ -181 +179 @@
 };
 
+enum ReplenishType
+{
+    REPLENISH_UNDEFINED = 0,
+    REPLENISH_HEALTH    = 20,
+    REPLENISH_MANA      = 21,
+    REPLENISH_RAGE      = 22
+};
+
+enum SpellTargets
+{
+    SPELL_TARGETS_FRIENDLY,
+    SPELL_TARGETS_AOE_DAMAGE,
+    SPELL_TARGETS_ENTRY
+};
+
 #define SPELL_SPELL_CHANNEL_UPDATE_INTERVAL 1000
 
@@ -187 +200 @@
 class Spell
 {
-    friend struct Trinity::SpellNotifierPlayer;
     friend struct Trinity::SpellNotifierCreatureAndPlayer;
     public:
@@ -498 +510 @@
         void DoAllEffectOnTarget(ItemTargetInfo *target);
         bool IsAliveUnitPresentInTargetList();
+        void SearchAreaTarget(std::list<Unit*> &data, float radius, const uint32 &type,
+            SpellTargets TargetType, uint32 entry = 0);
+        Unit* SearchNearbyTarget(float radius, SpellTargets TargetType, uint32 entry = 0);
+        void SearchChainTarget(std::list<Unit*> &data, Unit* pUnitTarget, float max_range, uint32 unMaxTargets);
         // -------------------------------------------
 
@@ -519 +535 @@
 };
 
-enum ReplenishType
-{
-    REPLENISH_UNDEFINED = 0,
-    REPLENISH_HEALTH    = 20,
-    REPLENISH_MANA      = 21,
-    REPLENISH_RAGE      = 22
-};
-
-enum SpellTargets
-{
-    SPELL_TARGETS_HOSTILE,
-    SPELL_TARGETS_NOT_FRIENDLY,
-    SPELL_TARGETS_NOT_HOSTILE,
-    SPELL_TARGETS_FRIENDLY,
-    SPELL_TARGETS_AOE_DAMAGE
-};
-
 namespace Trinity
 {
-    struct TRINITY_DLL_DECL SpellNotifierPlayer
-    {
-        std::list<Unit*> &i_data;
-        Spell &i_spell;
-        const uint32& i_index;
-        float i_radius;
-        Unit* i_originalCaster;
-
-        SpellNotifierPlayer(Spell &spell, std::list<Unit*> &data, const uint32 &i, float radius)
-            : i_data(data), i_spell(spell), i_index(i), i_radius(radius)
-        {
-            i_originalCaster = i_spell.GetOriginalCaster();
-        }
-
-        void Visit(PlayerMapType &m)
-        {
-            if(!i_originalCaster)
-                return;
-
-            for(PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr)
-            {
-                Player * pPlayer = itr->getSource();
-                if( !pPlayer->isAlive() || pPlayer->isInFlight())
-                    continue;
-
-                if( i_originalCaster->IsFriendlyTo(pPlayer) )
-                    continue;
-
-                if( pPlayer->GetDistance(i_spell.m_targets.m_destX, i_spell.m_targets.m_destY, i_spell.m_targets.m_destZ) < i_radius )
-                    i_data.push_back(pPlayer);
-            }
-        }
-        template<class SKIP> void Visit(GridRefManager<SKIP> &) {}
-    };
-
     struct TRINITY_DLL_DECL SpellNotifierCreatureAndPlayer
     {
@@ -581 +545 @@
         SpellTargets i_TargetType;
         Unit* i_originalCaster;
+        uint32 i_entry;
 
         SpellNotifierCreatureAndPlayer(Spell &spell, std::list<Unit*> &data, float radius, const uint32 &type,
-            SpellTargets TargetType = SPELL_TARGETS_NOT_FRIENDLY)
-            : i_data(&data), i_spell(spell), i_push_type(type), i_radius(radius), i_TargetType(TargetType)
+            SpellTargets TargetType = SPELL_TARGETS_AOE_DAMAGE, uint32 entry = 0)
+            : i_data(&data), i_spell(spell), i_push_type(type), i_radius(radius), i_TargetType(TargetType), i_entry(entry)
         {
             i_originalCaster = spell.GetOriginalCaster();
@@ -603 +568 @@
                 switch (i_TargetType)
                 {
-                    case SPELL_TARGETS_HOSTILE:
-                        if (!itr->getSource()->isTargetableForAttack() || !i_originalCaster->IsHostileTo( itr->getSource() ))
-                            continue;
-                        break;
-                    case SPELL_TARGETS_NOT_FRIENDLY:
-                        if (!itr->getSource()->isTargetableForAttack() || i_originalCaster->IsFriendlyTo( itr->getSource() ))
-                            continue;
-                        break;
-                    case SPELL_TARGETS_NOT_HOSTILE:
-                        if (!itr->getSource()->isTargetableForAttack() || i_originalCaster->IsHostileTo( itr->getSource() ))
-                            continue;
-                        break;
                     case SPELL_TARGETS_FRIENDLY:
                         if (!itr->getSource()->isTargetableForAttack() || !i_originalCaster->IsFriendlyTo( itr->getSource() ))
@@ -638 +591 @@
                                 continue;
                         }
-                    }
-                    break;
+                    }break;
+                    case SPELL_TARGETS_ENTRY:
+                    {
+                        if(itr->getSource()->GetTypeId()!=TYPEID_UNIT || itr->getSource()->GetEntry()!= i_entry)
+                            continue;
+                    }break;
                     default: continue;
                 }
@@ -661 +618 @@
                             i_data->push_back(itr->getSource());
                         break;
-                    case PUSH_TARGET_CENTER:
-                        if(i_spell.m_targets.getUnitTarget()->IsWithinDistInMap((Unit*)(itr->getSource()), i_radius))
-                            i_data->push_back(itr->getSource());
-                        break;
                 }
             }