aboutsummaryrefslogtreecommitdiff
path: root/src/bindings/scripts
diff options
context:
space:
mode:
authormegamage <none@none>2009-08-24 22:31:54 -0500
committermegamage <none@none>2009-08-24 22:31:54 -0500
commit87270fefc235d45c2d9116b4a26f0dc32f1a5d7e (patch)
treedfe9897672fc1e33fa8ee1b5fa4f9c299afa2aec /src/bindings/scripts
parenta8f394f8510797e60e93a22ed409d860579ad76b (diff)
*Some update of aura system. Remove unnecessary variables and parameters from auraeffect. Always refer to parent aura when finding target/source/caster.
--HG-- branch : trunk
Diffstat (limited to 'src/bindings/scripts')
-rw-r--r--src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_twinemperors.cpp4
-rw-r--r--src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp2
-rw-r--r--src/bindings/scripts/scripts/outland/black_temple/boss_bloodboil.cpp2
-rw-r--r--src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp2
-rw-r--r--src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp2
-rw-r--r--src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp2
6 files changed, 7 insertions, 7 deletions
diff --git a/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_twinemperors.cpp b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_twinemperors.cpp
index a96544db9b6..a4485a716b6 100644
--- a/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_twinemperors.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_twinemperors.cpp
@@ -421,7 +421,7 @@ struct TRINITY_DLL_DECL boss_veknilashAI : public boss_twinemperorsAI
continue;
eff_mask|=1<<i;
}
- target->AddAura(new Aura(spell, eff_mask, NULL, target, target));
+ target->AddAura(new Aura(spell, eff_mask, target, target, target));
target->SetHealth(target->GetMaxHealth());
}
@@ -506,7 +506,7 @@ struct TRINITY_DLL_DECL boss_veklorAI : public boss_twinemperorsAI
continue;
eff_mask|=1<<i;
}
- target->AddAura(new Aura(spell, eff_mask, NULL, target, target));
+ target->AddAura(new Aura(spell, eff_mask, target, target, target));
target->SetHealth(target->GetMaxHealth());
}
diff --git a/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp b/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp
index 1f6cd030ed9..c00c8017f4a 100644
--- a/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp
+++ b/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp
@@ -94,7 +94,7 @@ struct TRINITY_DLL_DECL mob_voidtravelerAI : public ScriptedAI
{
SpellEntry *spell = GET_SPELL(HeroicMode?H_SPELL_EMPOWERING_SHADOWS:SPELL_EMPOWERING_SHADOWS);
if (spell)
- Vorpil->AddAura(new Aura(spell, 1, NULL, Vorpil, m_creature));
+ Vorpil->AddAura(new Aura(spell, 1, Vorpil, me, me));
Vorpil->SetHealth(Vorpil->GetHealth()+Vorpil->GetMaxHealth()/25);
DoCast(m_creature, SPELL_SHADOW_NOVA, true);
m_creature->DealDamage(m_creature, m_creature->GetMaxHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
diff --git a/src/bindings/scripts/scripts/outland/black_temple/boss_bloodboil.cpp b/src/bindings/scripts/scripts/outland/black_temple/boss_bloodboil.cpp
index 12c3d445018..393fec996aa 100644
--- a/src/bindings/scripts/scripts/outland/black_temple/boss_bloodboil.cpp
+++ b/src/bindings/scripts/scripts/outland/black_temple/boss_bloodboil.cpp
@@ -168,7 +168,7 @@ struct TRINITY_DLL_DECL boss_gurtogg_bloodboilAI : public ScriptedAI
if (eff>=TOTAL_SPELL_EFFECTS)
continue;
- Aura *Aur = new Aura(spellInfo, i, NULL, target);
+ Aura *Aur = new Aura(spellInfo, i, target, target, target);
target->AddAura(Aur);
}
}
diff --git a/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp
index 3e5fe5b17f6..aada48bb3f5 100644
--- a/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp
+++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp
@@ -666,7 +666,7 @@ struct TRINITY_DLL_DECL mob_enchanted_elementalAI : public ScriptedAI
continue;
eff_mask|=1<<i;
}
- Vashj->AddAura(new Aura(spell, eff_mask, NULL, Vashj, Vashj));
+ Vashj->AddAura(new Aura(spell, eff_mask, Vashj, Vashj, Vashj));
}
m_creature->DealDamage(m_creature, m_creature->GetMaxHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
}
diff --git a/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp
index 3fb2c929d7c..d5d2c9ba30b 100644
--- a/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp
+++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp
@@ -515,7 +515,7 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI
continue;
eff_mask|=1<<i;
}
- (*itr)->AddAura(new Aura(spell, eff_mask, NULL, (*itr), (*itr)));
+ (*itr)->AddAura(new Aura(spell, eff_mask, *itr, *itr, *itr));
if (InnderDemon_Count > 4) InnderDemon_Count = 0;
//Safe storing of creatures
diff --git a/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp b/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp
index 4e61cc421ed..f67b15c472e 100644
--- a/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp
+++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp
@@ -248,7 +248,7 @@ struct TRINITY_DLL_DECL boss_kelidan_the_breakerAI : public ScriptedAI
continue;
eff_mask|=1<<i;
}
- m_creature->AddAura(new Aura(nova, eff_mask, NULL, m_creature, m_creature));
+ m_creature->AddAura(new Aura(nova, eff_mask, me, me, me));
}
if (HeroicMode)