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

Avoid crash in TurretAI if spell1=0 and issue an error log instead.

Browse Source 
Fixes issue #1360.
Fixes issue #1032.

(same for ArchorAI and AOEAI).

--HG--
branch : trunk
This commit is contained in:
Trazom62
2010-04-09 19:45:06 +02:00
parent fcd660b240
commit e0e8d6f6ee
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/game/CombatAI.cpp
View File

@@ -174,7 +174,9 @@ void CasterAI::UpdateAI(const uint32 diff)
ArchorAI::ArchorAI(Creature *c) : CreatureAI(c)
{
ASSERT(me->m_spells[0]);
if (!me->m_spells[0])
sLog.outError("ArchorAI set for creature (entry = %u) with spell1=0. AI will do nothing", me->GetEntry());
m_minRange = GetSpellMinRange(me->m_spells[0], false);
if (!m_minRange)
m_minRange = MELEE_RANGE;
@@ -219,7 +221,9 @@ void ArchorAI::UpdateAI(const uint32 diff)
TurretAI::TurretAI(Creature *c) : CreatureAI(c)
{
ASSERT(me->m_spells[0]);
if (!me->m_spells[0])
sLog.outError("TurretAI set for creature (entry = %u) with spell1=0. AI will do nothing", me->GetEntry());
m_minRange = GetSpellMinRange(me->m_spells[0], false);
me->m_CombatDistance = GetSpellMaxRange(me->m_spells[0], false);
me->m_SightDistance = me->m_CombatDistance;
@@ -246,10 +250,6 @@ void TurretAI::UpdateAI(const uint32 diff)
return;
DoSpellAttackIfReady(me->m_spells[0]);
//if (!DoSpellAttackIfReady(me->m_spells[0]))
//if (HostileReference *ref = me->getThreatManager().getCurrentVictim())
//ref->removeReference();
}
//////////////
@@ -258,7 +258,9 @@ void TurretAI::UpdateAI(const uint32 diff)
AOEAI::AOEAI(Creature *c) : CreatureAI(c)
{
ASSERT(me->m_spells[0]);
if (!me->m_spells[0])
sLog.outError("AOEAI set for creature (entry = %u) with spell1=0. AI will do nothing", me->GetEntry());
me->SetVisibility(VISIBILITY_ON);//visible to see all spell anims
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);//can't be targeted
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_ATTACKABLE_1);//can't be damaged
@@ -272,11 +274,10 @@ bool AOEAI::CanAIAttack(const Unit *who) const
void AOEAI::AttackStart(Unit *who)
{
}
void AOEAI::UpdateAI(const uint32 diff)
{
if (!me->HasAura(me->m_spells[0]))
me->CastSpell(me, me->m_spells[0],false);
}
}