Changeset 253 for trunk/src/game/Pet.cpp

Timestamp:

11/19/08 13:51:05 (17 years ago)

Author:

yumileroy

Message:

Backed out changeset 835660b317dc

Original author: KingPin? <KingPin?@Trinitycore.org>
Date: 2008-11-17 22:07:21-06:00

Files:

• trunk/src/game/Pet.cpp (modified) (6 diffs)

trunk/src/game/Pet.cpp

@@ -287 +287 @@
             ++iter;
             m_charmInfo->GetActionBarEntry(index)->SpellOrAction = atol((*iter).c_str());
-            // patch for old data where some spells have ACT_DECIDE but should have ACT_CAST
-            // so overwrite old state 
-            SpellEntry const *spellInfo = sSpellStore.LookupEntry(m_charmInfo->GetActionBarEntry(index)->SpellOrAction);
-            if (spellInfo && spellInfo->AttributesEx & SPELL_ATTR_EX_PET_NOT_AUTOCAST)
-                m_charmInfo->GetActionBarEntry(index)->Type = ACT_CAST;
         }
 
@@ -1292 +1287 @@
             Field *fields = result->Fetch();
 
-            addSpell(fields[0].GetUInt16(), (ActiveStates)fields[2].GetUInt16(), PETSPELL_UNCHANGED, fields[1].GetUInt16());
+            addSpell(fields[0].GetUInt16(), fields[2].GetUInt16(), PETSPELL_UNCHANGED, fields[1].GetUInt16());
         }
         while( result->NextRow() );
@@ -1423 +1418 @@
 }
 
-bool Pet::addSpell(uint16 spell_id, ActiveStates active, PetSpellState state, uint16 slot_id, PetSpellType type)
+bool Pet::addSpell(uint16 spell_id, uint16 active, PetSpellState state, uint16 slot_id, PetSpellType type)
 {
     SpellEntry const *spellInfo = sSpellStore.LookupEntry(spell_id);
@@ -1439 +1434 @@
         return false;
     }
-    // same spells don't have autocast option
-    if (spellInfo->AttributesEx & SPELL_ATTR_EX_PET_NOT_AUTOCAST)
-        active = ACT_CAST;
 
     PetSpellMap::iterator itr = m_spells.find(spell_id);
@@ -1517 +1509 @@
         CastSpell(this, spell_id, true);
     else if(state == PETSPELL_NEW)
-        m_charmInfo->AddSpellToAB(oldspell_id, spell_id, active);
+        m_charmInfo->AddSpellToAB(oldspell_id, spell_id);
 
     if(newspell->active == ACT_ENABLED)
@@ -1667 +1659 @@
         return;
 
-    /*if(const SpellEntry *tempSpell = GetSpellStore()->LookupEntry(spellid))
+    if(const SpellEntry *tempSpell = GetSpellStore()->LookupEntry(spellid))
         if(tempSpell->EffectImplicitTargetA[0] != TARGET_ALL_AROUND_CASTER
             && tempSpell->EffectImplicitTargetA[0] != TARGET_CHAIN_DAMAGE)
-            return;    */
+            return;    
 
     PetSpellMap::const_iterator itr = m_spells.find((uint16)spellid);