From 6469c21c411c2874bce2918f6bed313643e9f48a Mon Sep 17 00:00:00 2001 From: NoFantasy Date: Fri, 19 Feb 2010 02:13:13 +0100 Subject: [PATCH] [9410] Correct a typo in enum name, CAST_INTERRUPT_PREVIOUS Signed-off-by: NoFantasy --- src/game/CreatureAI.cpp | 4 ++-- src/game/CreatureAI.h | 2 +- src/game/CreatureEventAI.cpp | 4 ++-- src/shared/revision_nr.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/game/CreatureAI.cpp b/src/game/CreatureAI.cpp index 81096833c..b650b65fb 100644 --- a/src/game/CreatureAI.cpp +++ b/src/game/CreatureAI.cpp @@ -80,7 +80,7 @@ CanCastResult CreatureAI::DoCastSpellIfCan(Unit* pTarget, uint32 uiSpell, uint32 pCaster = pTarget; // Allowed to cast only if not casting (unless we interrupt ourself) or if spell is triggered - if (!pCaster->IsNonMeleeSpellCasted(false) || (uiCastFlags & (CAST_TRIGGERED | CAST_INTURRUPT_PREVIOUS))) + if (!pCaster->IsNonMeleeSpellCasted(false) || (uiCastFlags & (CAST_TRIGGERED | CAST_INTERRUPT_PREVIOUS))) { if (const SpellEntry* pSpell = sSpellStore.LookupEntry(uiSpell)) { @@ -101,7 +101,7 @@ CanCastResult CreatureAI::DoCastSpellIfCan(Unit* pTarget, uint32 uiSpell, uint32 } // Interrupt any previous spell - if (uiCastFlags & CAST_INTURRUPT_PREVIOUS && pCaster->IsNonMeleeSpellCasted(false)) + if (uiCastFlags & CAST_INTERRUPT_PREVIOUS && pCaster->IsNonMeleeSpellCasted(false)) pCaster->InterruptNonMeleeSpells(false); pCaster->CastSpell(pTarget, pSpell, uiCastFlags & CAST_TRIGGERED, NULL, NULL, uiOriginalCasterGUID); diff --git a/src/game/CreatureAI.h b/src/game/CreatureAI.h index ca088861d..423f2b66f 100644 --- a/src/game/CreatureAI.h +++ b/src/game/CreatureAI.h @@ -48,7 +48,7 @@ enum CanCastResult enum CastFlags { - CAST_INTURRUPT_PREVIOUS = 0x01, //Interrupt any spell casting + CAST_INTERRUPT_PREVIOUS = 0x01, //Interrupt any spell casting CAST_TRIGGERED = 0x02, //Triggered (this makes spell cost zero mana and have no cast time) CAST_FORCE_CAST = 0x04, //Forces cast even if creature is out of mana or out of range CAST_NO_MELEE_IF_OOM = 0x08, //Prevents creature from entering melee if out of mana or out of range diff --git a/src/game/CreatureEventAI.cpp b/src/game/CreatureEventAI.cpp index a2fb1b917..60accce40 100644 --- a/src/game/CreatureEventAI.cpp +++ b/src/game/CreatureEventAI.cpp @@ -452,7 +452,7 @@ void CreatureEventAI::ProcessAction(CreatureEventAI_Action const& action, uint32 caster = target; //Allowed to cast only if not casting (unless we interrupt ourself) or if spell is triggered - bool canCast = !caster->IsNonMeleeSpellCasted(false) || (action.cast.castFlags & (CAST_TRIGGERED | CAST_INTURRUPT_PREVIOUS)); + bool canCast = !caster->IsNonMeleeSpellCasted(false) || (action.cast.castFlags & (CAST_TRIGGERED | CAST_INTERRUPT_PREVIOUS)); // If cast flag CAST_AURA_NOT_PRESENT is active, check if target already has aura on them if(action.cast.castFlags & CAST_AURA_NOT_PRESENT) @@ -493,7 +493,7 @@ void CreatureEventAI::ProcessAction(CreatureEventAI_Action const& action, uint32 else { //Interrupt any previous spell - if (caster->IsNonMeleeSpellCasted(false) && action.cast.castFlags & CAST_INTURRUPT_PREVIOUS) + if (caster->IsNonMeleeSpellCasted(false) && action.cast.castFlags & CAST_INTERRUPT_PREVIOUS) caster->InterruptNonMeleeSpells(false); caster->CastSpell(target, action.cast.spellId, (action.cast.castFlags & CAST_TRIGGERED)); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 5da7d23cb..7a9f3a2dd 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "9409" + #define REVISION_NR "9410" #endif // __REVISION_NR_H__