diff options
| author | click <none@none> | 2010-07-19 14:17:30 +0200 |
|---|---|---|
| committer | click <none@none> | 2010-07-19 14:17:30 +0200 |
| commit | ba36f1eb23885260a832a41e9264b74881c8d285 (patch) | |
| tree | 89e6eed8a2f2aa7dc51fbe7e4d7d627c1cc67a38 /src/server/scripts/World | |
| parent | 84c6fa001ccbe8b2ce5ae2f1a756c7ba2fbfe36f (diff) | |
Clean up old (and partially unused) Aggro() function and use EnterCombat() instead + fix some minor enum-typos (INTURRUPT -> INTERRUPT)
(fix by Azazel)
--HG--
branch : trunk
Diffstat (limited to 'src/server/scripts/World')
| -rwxr-xr-x | src/server/scripts/World/boss_emeriss.cpp | 2 | ||||
| -rwxr-xr-x | src/server/scripts/World/boss_taerar.cpp | 2 | ||||
| -rwxr-xr-x | src/server/scripts/World/npcs_special.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/server/scripts/World/boss_emeriss.cpp b/src/server/scripts/World/boss_emeriss.cpp index e63a4a0d6d4..dc36e189f95 100755 --- a/src/server/scripts/World/boss_emeriss.cpp +++ b/src/server/scripts/World/boss_emeriss.cpp @@ -59,7 +59,7 @@ struct boss_emerissAI : public ScriptedAI m_uiCorruptionsCasted = 0; } - void Aggro(Unit* /*pWho*/) + void EnterCombat(Unit* /*pWho*/) { DoScriptText(SAY_AGGRO, me); } diff --git a/src/server/scripts/World/boss_taerar.cpp b/src/server/scripts/World/boss_taerar.cpp index 6b0823147b2..e23400feda7 100755 --- a/src/server/scripts/World/boss_taerar.cpp +++ b/src/server/scripts/World/boss_taerar.cpp @@ -173,7 +173,7 @@ struct boss_taerarAI : public ScriptedAI { if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) { - //Inturrupt any spell casting + //Interrupt any spell casting me->InterruptNonMeleeSpells(false); //horrible workaround, need to fix diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index cad93995675..f6fa8f04258 100755 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -1691,7 +1691,7 @@ struct mob_mojoAI : public ScriptedAI if (Unit* own = me->GetOwner()) me->GetMotionMaster()->MoveFollow(own,0,0); } - void Aggro(Unit * /*who*/){} + void EnterCombat(Unit * /*who*/){} void UpdateAI(const uint32 diff) { if (me->HasAura(20372)) |
