From 6f393be15abc7c8315b96656e6a97e0a7565b6d3 Mon Sep 17 00:00:00 2001 From: click Date: Tue, 6 Jul 2010 03:27:41 +0200 Subject: Update GPL-licensing information on scripts (now with the proper bling-bling headers!) If any more scriptfiles are missing their respective header, let us know please... --HG-- branch : trunk --- src/server/scripts/Custom/test.cpp | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) mode change 100644 => 100755 src/server/scripts/Custom/test.cpp (limited to 'src/server/scripts/Custom/test.cpp') diff --git a/src/server/scripts/Custom/test.cpp b/src/server/scripts/Custom/test.cpp old mode 100644 new mode 100755 index aa9e6879075..0f5dec744b0 --- a/src/server/scripts/Custom/test.cpp +++ b/src/server/scripts/Custom/test.cpp @@ -1,17 +1,19 @@ -/* Copyright (C) 2006 - 2008 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. +/* + * Copyright (C) 2008-2010 TrinityCore + * Copyright (C) 2006-2008 ScriptDev2 * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . */ /* ScriptData -- cgit v1.2.3 From ba36f1eb23885260a832a41e9264b74881c8d285 Mon Sep 17 00:00:00 2001 From: click Date: Mon, 19 Jul 2010 14:17:30 +0200 Subject: 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 --- src/server/game/AI/EventAI/CreatureEventAI.cpp | 4 ++-- src/server/game/AI/EventAI/CreatureEventAI.h | 2 +- src/server/scripts/Custom/custom_example.cpp | 2 +- src/server/scripts/Custom/test.cpp | 2 +- .../EasternKingdoms/AlteracValley/boss_drekthar.cpp | 2 +- .../EasternKingdoms/AlteracValley/boss_galvangar.cpp | 2 +- .../EasternKingdoms/AlteracValley/boss_vanndar.cpp | 2 +- .../EasternKingdoms/BlackrockSpire/boss_gyth.cpp | 2 +- .../BlackwingLair/boss_victor_nefarius.cpp | 2 +- .../EasternKingdoms/Karazhan/boss_netherspite.cpp | 2 +- .../EasternKingdoms/Karazhan/boss_shade_of_aran.cpp | 18 +++++++++--------- .../MagistersTerrace/boss_priestess_delrissa.cpp | 2 +- .../EasternKingdoms/Scholomance/boss_jandice_barov.cpp | 2 +- src/server/scripts/EasternKingdoms/hinterlands.cpp | 2 +- .../scripts/EasternKingdoms/silverpine_forest.cpp | 2 +- src/server/scripts/EasternKingdoms/wetlands.cpp | 2 +- src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp | 2 +- src/server/scripts/Kalimdor/ashenvale.cpp | 2 +- src/server/scripts/Kalimdor/the_barrens.cpp | 2 +- .../Northrend/ObsidianSanctum/boss_sartharion.cpp | 6 +++--- src/server/scripts/Northrend/borean_tundra.cpp | 2 +- src/server/scripts/Northrend/dalaran.cpp | 2 +- .../scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp | 10 +++++----- src/server/scripts/Outland/nagrand.cpp | 2 +- src/server/scripts/Outland/shadowmoon_valley.cpp | 2 +- src/server/scripts/World/boss_emeriss.cpp | 2 +- src/server/scripts/World/boss_taerar.cpp | 2 +- src/server/scripts/World/npcs_special.cpp | 2 +- 28 files changed, 43 insertions(+), 43 deletions(-) (limited to 'src/server/scripts/Custom/test.cpp') diff --git a/src/server/game/AI/EventAI/CreatureEventAI.cpp b/src/server/game/AI/EventAI/CreatureEventAI.cpp index c6ec06d8895..c70f471a82f 100644 --- a/src/server/game/AI/EventAI/CreatureEventAI.cpp +++ b/src/server/game/AI/EventAI/CreatureEventAI.cpp @@ -456,7 +456,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) @@ -492,7 +492,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/server/game/AI/EventAI/CreatureEventAI.h b/src/server/game/AI/EventAI/CreatureEventAI.h index 2fc5de46089..84b359787f5 100644 --- a/src/server/game/AI/EventAI/CreatureEventAI.h +++ b/src/server/game/AI/EventAI/CreatureEventAI.h @@ -150,7 +150,7 @@ enum Target 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/server/scripts/Custom/custom_example.cpp b/src/server/scripts/Custom/custom_example.cpp index 9010c958ea9..d922dfed0aa 100755 --- a/src/server/scripts/Custom/custom_example.cpp +++ b/src/server/scripts/Custom/custom_example.cpp @@ -91,7 +91,7 @@ struct TRINITY_DLL_DECL custom_exampleAI : public ScriptedAI //*** HANDLED FUNCTION *** //Attack Start is called whenever someone hits us. - void Aggro(Unit *who) + void EnterCombat(Unit *who) { //Say some stuff DoSay(SAY_AGGRO,LANG_UNIVERSAL,NULL); diff --git a/src/server/scripts/Custom/test.cpp b/src/server/scripts/Custom/test.cpp index 0f5dec744b0..0e841d450ba 100755 --- a/src/server/scripts/Custom/test.cpp +++ b/src/server/scripts/Custom/test.cpp @@ -87,7 +87,7 @@ struct TRINITY_DLL_DECL npc_testAI : public npc_escortAI } } - void Aggro(Unit*) + void EnterCombat(Unit*) { if (HasEscortState(STATE_ESCORT_ESCORTING)) me->Say(SAY_AGGRO1, LANG_UNIVERSAL, PlayerGUID); diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp index 5488a85af87..385812c6776 100755 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp @@ -62,7 +62,7 @@ struct boss_drektharAI : public ScriptedAI uiYellTimer = urand(20*IN_MILLISECONDS,30*IN_MILLISECONDS); //20 to 30 seconds } - void Aggro(Unit * /*who*/) + void EnterCombat(Unit * /*who*/) { DoScriptText(YELL_AGGRO, me); } diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp index 2c30c7c16b4..380a841fb7c 100755 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp @@ -55,7 +55,7 @@ struct boss_galvangarAI : public ScriptedAI uiResetTimer = 5*IN_MILLISECONDS; } - void Aggro(Unit * /*who*/) + void EnterCombat(Unit * /*who*/) { DoScriptText(YELL_AGGRO, me); } diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp index cb01944b998..6ae75c0fa06 100755 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp @@ -60,7 +60,7 @@ struct boss_vanndarAI : public ScriptedAI uiYellTimer = urand(20*IN_MILLISECONDS,30*IN_MILLISECONDS); } - void Aggro(Unit * /*who*/) + void EnterCombat(Unit * /*who*/) { DoScriptText(YELL_AGGRO, me); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gyth.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gyth.cpp index dec948f68df..676115b0595 100755 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gyth.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gyth.cpp @@ -178,7 +178,7 @@ struct boss_gythAI : public ScriptedAI && me->GetHealth() > 0) { //summon Rend and Change model to normal Gyth - //Inturrupt any spell casting + //Interrupt any spell casting me->InterruptNonMeleeSpells(false); //Gyth model me->SetDisplayId(9806); diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp index 85d1537ffd1..d6a31cda4af 100755 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp @@ -292,7 +292,7 @@ struct boss_victor_nefariusAI : public ScriptedAI //Teleport Victor Nefarius way out of the map //sMapMgr.GetMap(me->GetMapId(), me)->CreatureRelocation(me,0,0,-5000,0); - //Inturrupt any spell casting + //Interrupt any spell casting me->InterruptNonMeleeSpells(false); //Root self diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp index c3a2a85e74c..3e3f7ffb9c4 100755 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp @@ -247,7 +247,7 @@ struct boss_netherspiteAI : public ScriptedAI Door->SetGoState(open ? GO_STATE_ACTIVE : GO_STATE_READY); } - void Aggro(Unit * /*who*/) + void EnterCombat(Unit * /*who*/) { HandleDoors(false); SwitchToPortalPhase(); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp index ace2b186342..37ea79fefbe 100755 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp @@ -109,7 +109,7 @@ struct boss_aranAI : public ScriptedAI uint32 FireCooldown; uint32 FrostCooldown; - uint32 DrinkInturruptTimer; + uint32 DrinkInterruptTimer; bool ElementalsSpawned; bool Drinking; @@ -133,7 +133,7 @@ struct boss_aranAI : public ScriptedAI FireCooldown = 0; FrostCooldown = 0; - DrinkInturruptTimer = 10000; + DrinkInterruptTimer = 10000; ElementalsSpawned = false; Drinking = false; @@ -261,11 +261,11 @@ struct boss_aranAI : public ScriptedAI DoCast(me, SPELL_CONJURE, false); DoCast(me, SPELL_DRINK, false); me->SetStandState(UNIT_STAND_STATE_SIT); - DrinkInturruptTimer = 10000; + DrinkInterruptTimer = 10000; } } - //Drink Inturrupt + //Drink Interrupt if (Drinking && DrinkInturrupted) { Drinking = false; @@ -275,10 +275,10 @@ struct boss_aranAI : public ScriptedAI DoCast(me, SPELL_POTION, false); } - //Drink Inturrupt Timer + //Drink Interrupt Timer if (Drinking && !DrinkInturrupted) - if (DrinkInturruptTimer >= diff) - DrinkInturruptTimer -= diff; + if (DrinkInterruptTimer >= diff) + DrinkInterruptTimer -= diff; else { me->SetStandState(UNIT_STAND_STATE_STAND); @@ -476,13 +476,13 @@ struct boss_aranAI : public ScriptedAI void SpellHit(Unit* /*pAttacker*/, const SpellEntry* Spell) { - //We only care about inturrupt effects and only if they are durring a spell currently being casted + //We only care about interrupt effects and only if they are durring a spell currently being casted if ((Spell->Effect[0] != SPELL_EFFECT_INTERRUPT_CAST && Spell->Effect[1] != SPELL_EFFECT_INTERRUPT_CAST && Spell->Effect[2] != SPELL_EFFECT_INTERRUPT_CAST) || !me->IsNonMeleeSpellCasted(false)) return; - //Inturrupt effect + //Interrupt effect me->InterruptNonMeleeSpells(false); //Normally we would set the cooldown equal to the spell duration diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp index 3e5ddd8cce2..bc4049bb1fb 100755 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp @@ -597,7 +597,7 @@ struct boss_ellris_duskhallowAI : public boss_priestess_lackey_commonAI boss_priestess_lackey_commonAI::Reset(); } - void Aggro(Unit* /*pWho*/) + void EnterCombat(Unit* /*pWho*/) { DoCast(me, SPELL_SUMMON_IMP); } diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp index 370cd221029..63ba5885573 100755 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp @@ -93,7 +93,7 @@ struct boss_jandicebarovAI : public ScriptedAI if (!Invisible && Illusion_Timer <= diff) { - //Inturrupt any spell casting + //Interrupt any spell casting me->InterruptNonMeleeSpells(false); me->setFaction(35); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); diff --git a/src/server/scripts/EasternKingdoms/hinterlands.cpp b/src/server/scripts/EasternKingdoms/hinterlands.cpp index 13f44f47ff4..12c5a3acda3 100755 --- a/src/server/scripts/EasternKingdoms/hinterlands.cpp +++ b/src/server/scripts/EasternKingdoms/hinterlands.cpp @@ -101,7 +101,7 @@ struct npc_00x09hlAI : public npc_escortAI } } - void Aggro(Unit* pWho) + void EnterCombat(Unit* pWho) { if (pWho->GetEntry() == NPC_MARAUDING_OWL || pWho->GetEntry() == NPC_VILE_AMBUSHER) return; diff --git a/src/server/scripts/EasternKingdoms/silverpine_forest.cpp b/src/server/scripts/EasternKingdoms/silverpine_forest.cpp index 4b04083f4cd..cd88974788e 100755 --- a/src/server/scripts/EasternKingdoms/silverpine_forest.cpp +++ b/src/server/scripts/EasternKingdoms/silverpine_forest.cpp @@ -233,7 +233,7 @@ struct pyrewood_ambushAI : public ScriptedAI } } - void Aggro(Unit * /*who*/){} + void EnterCombat(Unit * /*who*/){} void JustSummoned(Creature *pSummoned) { diff --git a/src/server/scripts/EasternKingdoms/wetlands.cpp b/src/server/scripts/EasternKingdoms/wetlands.cpp index b7b92462f11..084b673dacd 100755 --- a/src/server/scripts/EasternKingdoms/wetlands.cpp +++ b/src/server/scripts/EasternKingdoms/wetlands.cpp @@ -71,7 +71,7 @@ struct npc_tapoke_slim_jahnAI : public npc_escortAI } } - void Aggro(Unit* /*pWho*/) + void EnterCombat(Unit* /*pWho*/) { Player* pPlayer = GetPlayerForEscort(); diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp index 96aa6bd7785..f2856e89fd1 100755 --- a/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp @@ -96,7 +96,7 @@ struct boss_noxxionAI : public ScriptedAI //Adds_Timer if (!Invisible && Adds_Timer <= diff) { - //Inturrupt any spell casting + //Interrupt any spell casting //me->m_canMove = true; me->InterruptNonMeleeSpells(false); me->setFaction(35); diff --git a/src/server/scripts/Kalimdor/ashenvale.cpp b/src/server/scripts/Kalimdor/ashenvale.cpp index 1b64bd08437..2d1b39de980 100755 --- a/src/server/scripts/Kalimdor/ashenvale.cpp +++ b/src/server/scripts/Kalimdor/ashenvale.cpp @@ -325,7 +325,7 @@ struct npc_muglashAI : public npc_escortAI } } - void Aggro(Unit* /*pWho*/) + void EnterCombat(Unit* /*pWho*/) { if (HasEscortState(STATE_ESCORT_PAUSED)) { diff --git a/src/server/scripts/Kalimdor/the_barrens.cpp b/src/server/scripts/Kalimdor/the_barrens.cpp index 258ab475c84..901e3b8b923 100755 --- a/src/server/scripts/Kalimdor/the_barrens.cpp +++ b/src/server/scripts/Kalimdor/the_barrens.cpp @@ -125,7 +125,7 @@ struct npc_giltharesAI : public npc_escortAI } } - void Aggro(Unit* pWho) + void EnterCombat(Unit* pWho) { //not always use if (rand()%4) diff --git a/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp index ffeda4d4b7f..65d870afc0d 100644 --- a/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp +++ b/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp @@ -998,7 +998,7 @@ struct mob_tenebronAI : public dummy_dragonAI m_bHasPortalOpen = false; } - void Aggro(Unit* pWho) + void EnterCombat(Unit* pWho) { DoScriptText(SAY_TENEBRON_AGGRO, me); DoZoneInCombat(); @@ -1091,7 +1091,7 @@ struct mob_shadronAI : public dummy_dragonAI m_bHasPortalOpen = false; } - void Aggro(Unit* pWho) + void EnterCombat(Unit* pWho) { DoScriptText(SAY_SHADRON_AGGRO,me); DoZoneInCombat(); @@ -1187,7 +1187,7 @@ struct mob_vesperonAI : public dummy_dragonAI m_bHasPortalOpen = false; } - void Aggro(Unit* pWho) + void EnterCombat(Unit* pWho) { DoScriptText(SAY_VESPERON_AGGRO,me); DoZoneInCombat(); diff --git a/src/server/scripts/Northrend/borean_tundra.cpp b/src/server/scripts/Northrend/borean_tundra.cpp index 760750fece7..b2b975f54ab 100755 --- a/src/server/scripts/Northrend/borean_tundra.cpp +++ b/src/server/scripts/Northrend/borean_tundra.cpp @@ -2110,7 +2110,7 @@ struct npc_warmage_coldarraAI : public Scripted_NoMovementAI m_uiTimer = 0; } - void Aggro(Unit* /*pWho*/) {} + void EnterCombat(Unit* /*pWho*/) {} void AttackStart(Unit* /*pWho*/) {} diff --git a/src/server/scripts/Northrend/dalaran.cpp b/src/server/scripts/Northrend/dalaran.cpp index b0dbd17559d..a602b84fcf0 100755 --- a/src/server/scripts/Northrend/dalaran.cpp +++ b/src/server/scripts/Northrend/dalaran.cpp @@ -52,7 +52,7 @@ struct npc_mageguard_dalaranAI : public Scripted_NoMovementAI void Reset(){} - void Aggro(Unit* /*pWho*/){} + void EnterCombat(Unit* /*pWho*/){} void AttackStart(Unit* /*pWho*/){} diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp index 2dfc990bdb7..b6cfca4940a 100755 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp @@ -416,7 +416,7 @@ struct boss_kaelthasAI : public ScriptedAI } } - void Aggro(Unit * /*who*/) + void EnterCombat(Unit * /*who*/) { if (m_pInstance && !m_pInstance->GetData(DATA_KAELTHASEVENT) && !Phase) StartEvent(); @@ -985,7 +985,7 @@ struct boss_thaladred_the_darkenerAI : public advisorbase_ai advisorbase_ai::Reset(); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -1058,7 +1058,7 @@ struct boss_lord_sanguinarAI : public advisorbase_ai advisorbase_ai::Reset(); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -1141,7 +1141,7 @@ struct boss_grand_astromancer_capernianAI : public advisorbase_ai } } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -1243,7 +1243,7 @@ struct boss_master_engineer_telonicusAI : public advisorbase_ai DoScriptText(SAY_TELONICUS_DEATH, me); } - void Aggro(Unit *who) + void EnterCombat(Unit *who) { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; diff --git a/src/server/scripts/Outland/nagrand.cpp b/src/server/scripts/Outland/nagrand.cpp index d78377cfd28..c2d76b0e9bb 100755 --- a/src/server/scripts/Outland/nagrand.cpp +++ b/src/server/scripts/Outland/nagrand.cpp @@ -566,7 +566,7 @@ struct npc_maghar_captiveAI : public npc_escortAI m_uiFrostShockTimer = 6000; } - void Aggro(Unit* /*pWho*/) + void EnterCombat(Unit* /*pWho*/) { DoCast(me, SPELL_EARTHBIND_TOTEM, false); } diff --git a/src/server/scripts/Outland/shadowmoon_valley.cpp b/src/server/scripts/Outland/shadowmoon_valley.cpp index f059bc96b13..b85959b34c8 100755 --- a/src/server/scripts/Outland/shadowmoon_valley.cpp +++ b/src/server/scripts/Outland/shadowmoon_valley.cpp @@ -972,7 +972,7 @@ struct npc_earthmender_wildaAI : public npc_escortAI DoSummon(NPC_COILSKAR_ASSASSIN, me, 15.0f, 5000, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT); } - void Aggro(Unit* pWho) + void EnterCombat(Unit* pWho) { //don't always use if (rand()%5) 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)) -- cgit v1.2.3