Changeset 122 for trunk/src/game/SpellMgr.h

Timestamp:

11/19/08 13:38:14 (17 years ago)

Author:

yumileroy

Message:

[svn] Fix a compile error about M_PI_2.
Update Felmyst script to test new setActive function.
Fix the bug that priest's fear is unbreakable (dirty hack before find the correct way).
(some unfinished unused content included, just ignore them, will finish them later)

Original author: megamage
Date: 2008-10-27 10:57:53-05:00

Files:

• trunk/src/game/SpellMgr.h (modified) (4 diffs)

trunk/src/game/SpellMgr.h

@@ -635 +635 @@
 }
 
-enum SpellExtraInfoType
-{
-    SPELL_EXTRA_INFO_MAX_TARGETS,
-    SPELL_EXTRA_INFO_CONE_TYPE,
-    SPELL_EXTRA_INFO_SHARE_DAMAGE
-};
-
-struct SpellExtraInfo
-{
-    uint32 info[3];
-};
-
-typedef std::map<uint32, SpellExtraInfo> SpellExtraInfoMap;
+enum SpellExtraAttributeType
+{
+    SPELL_EXTRA_ATTR_MAX_TARGETS,
+    SPELL_EXTRA_ATTR_CONE_TYPE,
+    SPELL_EXTRA_ATTR_SHARE_DAMAGE
+};
+
+struct SpellExtraAttribute
+{
+    uint32 attr[3];
+};
+
+typedef std::map<uint32, SpellExtraAttribute> SpellExtraAttrMap;
+
+typedef std::map<int32, int32> SpellLinkedMap;
 
 class SpellMgr
@@ -847 +849 @@
         }
 
-        uint32 GetSpellExtraInfo(uint32 spell_id, uint32 type) const
-        {
-            SpellExtraInfoMap::const_iterator itr = mSpellExtraInfoMap.find(spell_id);
-            if(itr != mSpellExtraInfoMap.end())
-                return itr->second.info[type];
+        uint32 GetSpellExtraAttr(uint32 spell_id, uint32 type) const
+        {
+            SpellExtraAttrMap::const_iterator itr = mSpellExtraAttrMap.find(spell_id);
+            if(itr != mSpellExtraAttrMap.end())
+                return itr->second.attr[type];
+            else
+                return 0;
+        }
+
+        int32 GetSpellLinked(int32 spell_id) const
+        {
+            SpellLinkedMap::const_iterator itr = mSpellLinkedMap.find(spell_id);
+            if(itr != mSpellLinkedMap.end())
+                return itr->second;
             else
                 return 0;
@@ -872 +883 @@
         void LoadSkillLineAbilityMap();
         void LoadSpellPetAuras();
-        void LoadSpellExtraInfo();
+        void LoadSpellExtraAttr();
+        void LoadSpellLinked();
 
     private:
@@ -886 +898 @@
         SkillLineAbilityMap mSkillLineAbilityMap;
         SpellPetAuraMap     mSpellPetAuraMap;
-        SpellExtraInfoMap   mSpellExtraInfoMap;
+        SpellExtraAttrMap   mSpellExtraAttrMap;
+        SpellLinkedMap      mSpellLinkedMap;
 };