Changeset 236 for trunk

Timestamp:

11/19/08 13:49:22 (17 years ago)

Author:

yumileroy

Message:

[svn] Fix the bug that next melee spells and auto shoot do not work.

Original author: megamage
Date: 2008-11-15 10:21:37-06:00

Location:

trunk/src/game

Files:

• Spell.cpp (modified) (1 diff)
• SpellAuras.cpp (modified) (1 diff)
• SpellAuras.h (modified) (1 diff)
• SpellMgr.cpp (modified) (1 diff)
• Unit.cpp (modified) (2 diffs)

trunk/src/game/Spell.cpp

@@ -2143 +2143 @@
         m_selfContainer = &(m_caster->m_currentSpells[GetCurrentContainer()]);
         SendSpellStart();
-        m_caster->addUnitState(UNIT_STAT_CASTING);
     }
 }

trunk/src/game/SpellAuras.cpp

@@ -1883 +1883 @@
     }
     m_target->CastSpell(target, triggeredSpellInfo, true, 0, this, originalCasterGUID);
-    /*// All ok cast by default case
-    Spell *spell = new Spell(m_target, triggeredSpellInfo, true, originalCasterGUID );
-
-    SpellCastTargets targets;
-    targets.setUnitTarget( target );
-
-    // if spell create dynamic object extract area from it
-    if(DynamicObject* dynObj = caster->GetDynObject(GetId()))
-        targets.setDestination(dynObj->GetPositionX(),dynObj->GetPositionY(),dynObj->GetPositionZ());
-
-    spell->prepare(&targets, this);*/
+}
+
+Unit* Aura::GetTriggerTarget() const
+{
+    Unit* target = ObjectAccessor::GetUnit(*m_target,
+        /*m_target->GetTypeId()==TYPEID_PLAYER ?
+        ((Player*)m_target)->GetSelection() :*/
+        m_target->GetUInt64Value(UNIT_FIELD_TARGET));
+    return target ? target : m_target;
 }
 

trunk/src/game/SpellAuras.h

@@ -288 +288 @@
         void SetAuraProcCharges(int32 charges) { m_procCharges = charges; }
 
-        virtual Unit* GetTriggerTarget() const { return m_target; }
+        Unit* GetTriggerTarget() const;
 
         // add/remove SPELL_AURA_MOD_SHAPESHIFT (36) linked auras

trunk/src/game/SpellMgr.cpp

@@ -1704 +1704 @@
         case 31347: // Doom
         case 41635: // Prayer of Mending
+        case 44869: // Spectral Blast
+        case 45027: // Revitalize
+        case 45976: // Muru Portal Channel
             mSpellCustomAttrMap[tempSpell->Id] |= SPELL_ATTR_CU_PLAYERS_ONLY;
             tempSpell->MaxAffectedTargets = 1;

trunk/src/game/Unit.cpp

@@ -3305 +3305 @@
                 m_AutoRepeatFirstCast = true;
             }
+            addUnitState(UNIT_STAT_CASTING);
         } break;
 
@@ -3317 +3318 @@
                 m_currentSpells[CURRENT_AUTOREPEAT_SPELL]->m_spellInfo->Category == 351 )
                 InterruptSpell(CURRENT_AUTOREPEAT_SPELL);
+            addUnitState(UNIT_STAT_CASTING);
         } break;