josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up old (and partially unused) Aggro() function and use EnterCombat() instead + fix some minor enum-typos (INTURRUPT -> INTERRUPT)

Browse Source 
(fix by Azazel)

--HG--
branch : trunk
This commit is contained in:
click
2010-07-19 14:17:30 +02:00
parent 84c6fa001c
commit ba36f1eb23
28 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
+5 -5
View File
@@ -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;
src/server/scripts/Outland/nagrand.cpp
+1 -1
View File
@@ -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);
}
src/server/scripts/Outland/shadowmoon_valley.cpp
+1 -1
View File
@@ -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)