aboutsummaryrefslogtreecommitdiff
path: root/src/bindings/scripts
diff options
context:
space:
mode:
authormegamage <none@none>2009-05-09 22:00:18 -0500
committermegamage <none@none>2009-05-09 22:00:18 -0500
commit67876f9dfe14783e9c81bf5a8bab6843d30b22bc (patch)
tree7c16c48aa18c93c0662993b922bb384340d8bffc /src/bindings/scripts
parent3b14179f65d3c0cd14604d8698d5af438cca25e3 (diff)
*Fix a creature spell use bug.
--HG-- branch : trunk
Diffstat (limited to 'src/bindings/scripts')
-rw-r--r--src/bindings/scripts/scripts/creature/mob_generic_creature.cpp21
1 files changed, 2 insertions, 19 deletions
diff --git a/src/bindings/scripts/scripts/creature/mob_generic_creature.cpp b/src/bindings/scripts/scripts/creature/mob_generic_creature.cpp
index 56155a9ff2f..ec987e31c0e 100644
--- a/src/bindings/scripts/scripts/creature/mob_generic_creature.cpp
+++ b/src/bindings/scripts/scripts/creature/mob_generic_creature.cpp
@@ -166,25 +166,8 @@ struct TRINITY_DLL_DECL trigger_periodicAI : public NullCreatureAI
{
trigger_periodicAI(Creature* c) : NullCreatureAI(c)
{
- if(me->m_spells[0])
- {
- if(me->m_spells[1])
- spell = GetSpellStore()->LookupEntry(HEROIC(me->m_spells[0], me->m_spells[1]));
- else
- spell = GetSpellStore()->LookupEntry(me->m_spells[0]);
- }
- else
- spell = NULL;
-
- if(me->m_spells[2])
- {
- if(me->m_spells[3])
- interval = HEROIC(me->m_spells[2], me->m_spells[3]);
- else
- interval = me->m_spells[2];
- }
- else
- interval = 1000;
+ spell = me->m_spells[0] ? GetSpellStore()->LookupEntry(me->m_spells[0]) : NULL;
+ interval = me->m_spells[1] ? me->m_spells[1] : 1000;
timer = interval;
}