From 39083f4ff837d23cc886338fc9bc74df90fe9613 Mon Sep 17 00:00:00 2001 From: megamage Date: Wed, 10 Dec 2008 20:25:47 -0600 Subject: *Add function SummonTrigger and allow to override its AI. *Remove some trigger scripts. Use default trigger AI and db data instead. *Small fix on eagle boss' electrical storm. --HG-- branch : trunk --- src/bindings/scripts/include/sc_creature.cpp | 4 ++-- src/bindings/scripts/include/sc_creature.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/bindings/scripts/include') diff --git a/src/bindings/scripts/include/sc_creature.cpp b/src/bindings/scripts/include/sc_creature.cpp index a3c185391cc..e3bcc2129cc 100644 --- a/src/bindings/scripts/include/sc_creature.cpp +++ b/src/bindings/scripts/include/sc_creature.cpp @@ -220,10 +220,10 @@ void ScriptedAI::DoStopAttack() void ScriptedAI::DoCast(Unit* victim, uint32 spellId, bool triggered) { - if (!victim || m_creature->IsNonMeleeSpellCasted(false)) + if (!victim || m_creature->hasUnitState(UNIT_STAT_CASTING)) return; - m_creature->StopMoving(); + //m_creature->StopMoving(); m_creature->CastSpell(victim, spellId, triggered); } diff --git a/src/bindings/scripts/include/sc_creature.h b/src/bindings/scripts/include/sc_creature.h index 01f5df473c1..c0c09d70e34 100644 --- a/src/bindings/scripts/include/sc_creature.h +++ b/src/bindings/scripts/include/sc_creature.h @@ -183,13 +183,13 @@ struct TRINITY_DLL_DECL Scripted_NoMovementAI : public ScriptedAI void AttackStart(Unit *); }; -struct TRINITY_DLL_DECL NullCreatureAI : public CreatureAI +struct TRINITY_DLL_DECL NullCreatureAI : public ScriptedAI { - NullCreatureAI(Creature* c) : m_creature(c) {} + NullCreatureAI(Creature* c) : ScriptedAI(c) {} ~NullCreatureAI() {} - Creature *m_creature; - + void Reset() {} + void Aggro(Unit*) {} void MoveInLineOfSight(Unit *) {} void AttackStart(Unit *) {} void EnterEvadeMode() {} -- cgit v1.2.3