Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-18 16:38:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

*More fixes of scripts.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-06-17 19:23:17 -05:00
parent 816247bfd3
commit 3fab9ff35e
5 changed files with 2 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/bindings/scripts/scripts/npc/npc_escortAI.cpp
View File

@@ -33,18 +33,6 @@ void npc_escortAI::AttackStart(Unit *who)
}
}
void npc_escortAI::EnterCombat(Unit* pEnemy)
{
if (!pEnemy)
return;
Aggro(pEnemy);
}
void npc_escortAI::Aggro(Unit* pEnemy)
{
}
void npc_escortAI::MoveInLineOfSight(Unit *who)
{
if (IsBeingEscorted && !Attack)

4
src/bindings/scripts/scripts/npc/npc_escortAI.h
View File

@@ -34,16 +34,12 @@ struct TRINITY_DLL_DECL npc_escortAI : public ScriptedAI
// Pure Virtual Functions
virtual void WaypointReached(uint32) = 0;
virtual void Aggro(Unit*);
// CreatureAI functions
npc_escortAI(Creature *c) : ScriptedAI(c), IsBeingEscorted(false), PlayerTimer(1000), MaxPlayerDistance(DEFAULT_MAX_PLAYER_DISTANCE), CanMelee(true), DespawnAtEnd(true), DespawnAtFar(true)
{}
void AttackStart(Unit* who);
void EnterCombat(Unit*);
void MoveInLineOfSight(Unit* who);
void JustRespawned();

2
src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp
View File

@@ -114,7 +114,7 @@ struct TRINITY_DLL_DECL boss_hydross_the_unstableAI : public ScriptedAI
m_pInstance->SetData(DATA_HYDROSSTHEUNSTABLEEVENT, NOT_STARTED);
}
void Aggro(Unit* pWho)
void EnterCombat(Unit* pWho)
{
DoScriptText(SAY_AGGRO, m_creature);

4
src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp
View File

@@ -119,7 +119,7 @@ struct TRINITY_DLL_DECL boss_morogrim_tidewalkerAI : public ScriptedAI
m_pInstance->SetData(DATA_MOROGRIMTIDEWALKEREVENT, NOT_STARTED);
}
void Aggro(Unit* pWho)
void EnterCombat(Unit* pWho)
{
DoScriptText(SAY_AGGRO, m_creature);
@@ -255,8 +255,6 @@ struct TRINITY_DLL_DECL mob_water_globuleAI : public ScriptedAI
m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
}
void Aggro(Unit* pWho) {}
void MoveInLineOfSight(Unit* pWho)
{
if (!pWho || m_creature->getVictim())

4
src/bindings/scripts/scripts/zone/stormwind/stormwind_city.cpp
View File

@@ -96,8 +96,6 @@ struct TRINITY_DLL_DECL npc_bartlebyAI : public ScriptedAI
AttackStart(pAttacker);
}
void Aggro(Unit *who) { }
void DamageTaken(Unit* pDoneBy, uint32 &uiDamage)
{
if (uiDamage > m_creature->GetHealth() || ((m_creature->GetHealth() - uiDamage)*100 / m_creature->GetMaxHealth() < 15))
@@ -163,8 +161,6 @@ struct TRINITY_DLL_DECL npc_dashel_stonefistAI : public ScriptedAI
AttackStart(pAttacker);
}
void Aggro(Unit *who) {}
void DamageTaken(Unit* pDoneBy, uint32 &uiDamage)
{
if (uiDamage > m_creature->GetHealth() || ((m_creature->GetHealth() - uiDamage)*100 / m_creature->GetMaxHealth() < 15))