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

[7667] Add to CreatureAI field pointing to creature itself. Use it instead diff. fields in subclases. Author: VladimirMangos

Browse Source 
Also send pointer to AI constructors ans mark constructors as explicit.

    This changes allow move now some generic often used AI code to CreatureAI helper functions.

--HG--
branch : trunk
This commit is contained in:
megamage
2009-04-14 19:54:49 -05:00
parent 4f4c6aeaf5
commit 3a65800218
15 changed files with 289 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/AggressorAI.cpp
+26 -26
View File
@@ -37,78 +37,78 @@ AggressorAI::Permissible(const Creature *creature)
return PERMIT_BASE_NO; return PERMIT_BASE_NO;
} }
AggressorAI::AggressorAI(Creature *c) : CreatureAI(c), i_creature(*c), i_victimGuid(0), i_state(STATE_NORMAL), i_tracker(TIME_INTERVAL_LOOK) AggressorAI::AggressorAI(Creature *c) : CreatureAI(c), i_victimGuid(0), i_state(STATE_NORMAL), i_tracker(TIME_INTERVAL_LOOK)
{ {
} }
void AggressorAI::EnterEvadeMode() void AggressorAI::EnterEvadeMode()
{ {
if( !i_creature.isAlive() ) if( !m_creature->isAlive() )
{ {
DEBUG_LOG("Creature stopped attacking cuz his dead [guid=%u]", i_creature.GetGUIDLow()); DEBUG_LOG("Creature stopped attacking cuz his dead [guid=%u]", m_creature->GetGUIDLow());
i_victimGuid = 0; i_victimGuid = 0;
i_creature.CombatStop(); m_creature->CombatStop();
i_creature.DeleteThreatList(); m_creature->DeleteThreatList();
return; return;
} }
Unit* victim = ObjectAccessor::GetUnit(i_creature, i_victimGuid ); Unit* victim = ObjectAccessor::GetUnit(*m_creature, i_victimGuid );
if( !victim ) if( !victim )
{ {
DEBUG_LOG("Creature stopped attacking because victim is non exist [guid=%u]", i_creature.GetGUIDLow()); DEBUG_LOG("Creature stopped attacking because victim is non exist [guid=%u]", m_creature->GetGUIDLow());
} }
else if( !victim->isAlive() ) else if( !victim->isAlive() )
{ {
DEBUG_LOG("Creature stopped attacking cuz his victim is dead [guid=%u]", i_creature.GetGUIDLow()); DEBUG_LOG("Creature stopped attacking cuz his victim is dead [guid=%u]", m_creature->GetGUIDLow());
} }
else if( victim->HasStealthAura() ) else if( victim->HasStealthAura() )
{ {
DEBUG_LOG("Creature stopped attacking cuz his victim is stealth [guid=%u]", i_creature.GetGUIDLow()); DEBUG_LOG("Creature stopped attacking cuz his victim is stealth [guid=%u]", m_creature->GetGUIDLow());
} }
else if( victim->isInFlight() ) else if( victim->isInFlight() )
{ {
DEBUG_LOG("Creature stopped attacking cuz his victim is fly away [guid=%u]", i_creature.GetGUIDLow()); DEBUG_LOG("Creature stopped attacking cuz his victim is fly away [guid=%u]", m_creature->GetGUIDLow());
} }
else else
{ {
DEBUG_LOG("Creature stopped attacking due to target out run him [guid=%u]", i_creature.GetGUIDLow()); DEBUG_LOG("Creature stopped attacking due to target out run him [guid=%u]", m_creature->GetGUIDLow());
//i_state = STATE_LOOK_AT_VICTIM; //i_state = STATE_LOOK_AT_VICTIM;
//i_tracker.Reset(TIME_INTERVAL_LOOK); //i_tracker.Reset(TIME_INTERVAL_LOOK);
} }
if(!i_creature.GetCharmerOrOwner()) if(!m_creature->GetCharmerOrOwner())
{ {
i_creature.RemoveAllAuras(); m_creature->RemoveAllAuras();
// Remove TargetedMovementGenerator from MotionMaster stack list, and add HomeMovementGenerator instead // Remove TargetedMovementGenerator from MotionMaster stack list, and add HomeMovementGenerator instead
if( i_creature.GetMotionMaster()->GetCurrentMovementGeneratorType() == TARGETED_MOTION_TYPE ) if( m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == TARGETED_MOTION_TYPE )
i_creature.GetMotionMaster()->MoveTargetedHome(); m_creature->GetMotionMaster()->MoveTargetedHome();
} }
else if (i_creature.GetOwner() && i_creature.GetOwner()->isAlive()) else if (m_creature->GetOwner() && m_creature->GetOwner()->isAlive())
i_creature.GetMotionMaster()->MoveFollow(i_creature.GetOwner(),PET_FOLLOW_DIST,PET_FOLLOW_ANGLE); m_creature->GetMotionMaster()->MoveFollow(m_creature->GetOwner(),PET_FOLLOW_DIST,PET_FOLLOW_ANGLE);
i_creature.DeleteThreatList(); m_creature->DeleteThreatList();
i_victimGuid = 0; i_victimGuid = 0;
i_creature.CombatStop(); m_creature->CombatStop();
i_creature.SetLootRecipient(NULL); m_creature->SetLootRecipient(NULL);
} }
void void
AggressorAI::UpdateAI(const uint32 /*diff*/) AggressorAI::UpdateAI(const uint32 /*diff*/)
{ {
// update i_victimGuid if i_creature.getVictim() !=0 and changed // update i_victimGuid if m_creature->getVictim() !=0 and changed
if(!UpdateVictim()) if(!UpdateVictim())
return; return;
i_victimGuid = i_creature.getVictim()->GetGUID(); i_victimGuid = m_creature->getVictim()->GetGUID();
if( i_creature.isAttackReady() ) if( m_creature->isAttackReady() )
{ {
if( i_creature.IsWithinMeleeRange(i_creature.getVictim())) if( m_creature->IsWithinMeleeRange(m_creature->getVictim()))
{ {
i_creature.AttackerStateUpdate(i_creature.getVictim()); m_creature->AttackerStateUpdate(m_creature->getVictim());
i_creature.resetAttackTimer(); m_creature->resetAttackTimer();
} }
} }
} }
src/game/AggressorAI.h
+1 -2
View File
@@ -36,7 +36,7 @@ class TRINITY_DLL_DECL AggressorAI : public CreatureAI
public: public:
AggressorAI(Creature *c); explicit AggressorAI(Creature *c);
void EnterEvadeMode(); void EnterEvadeMode();
@@ -44,7 +44,6 @@ class TRINITY_DLL_DECL AggressorAI : public CreatureAI
static int Permissible(const Creature *); static int Permissible(const Creature *);
private: private:
Creature &i_creature;
uint64 i_victimGuid; uint64 i_victimGuid;
AggressorState i_state; AggressorState i_state;
TimeTracker i_tracker; TimeTracker i_tracker;
src/game/CreatureAI.h
+4 -3
View File
@@ -75,7 +75,7 @@ class TRINITY_DLL_SPEC UnitAI
protected: protected:
Unit *me; Unit *me;
public: public:
UnitAI(Unit *u) : me(u) {} explicit UnitAI(Unit *u) : me(u) {}
virtual void AttackStart(Unit *); virtual void AttackStart(Unit *);
virtual void UpdateAI(const uint32 diff) = 0; virtual void UpdateAI(const uint32 diff) = 0;
@@ -97,7 +97,7 @@ class TRINITY_DLL_SPEC PlayerAI : public UnitAI
protected: protected:
Player *me; Player *me;
public: public:
PlayerAI(Player *p) : UnitAI((Unit*)p), me(p) {} explicit PlayerAI(Player *p) : UnitAI((Unit*)p), me(p) {}
void OnCharmed(bool apply); void OnCharmed(bool apply);
}; };
@@ -112,10 +112,11 @@ class TRINITY_DLL_SPEC CreatureAI : public UnitAI
{ {
protected: protected:
Creature *me; Creature *me;
Creature *m_creature;
bool UpdateVictim(); bool UpdateVictim();
public: public:
CreatureAI(Creature *c) : UnitAI((Unit*)c), me(c) {} explicit CreatureAI(Creature *c) : UnitAI((Unit*)c), me(c), m_creature(c) {}
virtual ~CreatureAI() {} virtual ~CreatureAI() {}
src/game/CreatureEventAI.cpp
+128 -128
View File
@@ -39,9 +39,9 @@ int CreatureEventAI::Permissible(const Creature *creature)
return PERMIT_BASE_NO; return PERMIT_BASE_NO;
} }
CreatureEventAI::CreatureEventAI(Creature *c) : CreatureAI(c), m_creature(*c), InCombat(false) CreatureEventAI::CreatureEventAI(Creature *c) : CreatureAI(c), InCombat(false)
{ {
CreatureEventAI_Event_Map::iterator CreatureEvents = CreatureEAI_Mgr.GetCreatureEventAIMap().find(m_creature.GetEntry()); CreatureEventAI_Event_Map::iterator CreatureEvents = CreatureEAI_Mgr.GetCreatureEventAIMap().find(m_creature->GetEntry());
if (CreatureEvents != CreatureEAI_Mgr.GetCreatureEventAIMap().end()) if (CreatureEvents != CreatureEAI_Mgr.GetCreatureEventAIMap().end())
{ {
std::vector<CreatureEventAI_Event>::iterator i; std::vector<CreatureEventAI_Event>::iterator i;
@@ -53,10 +53,10 @@ CreatureEventAI::CreatureEventAI(Creature *c) : CreatureAI(c), m_creature(*c), I
if ((*i).event_flags & EFLAG_DEBUG_ONLY) if ((*i).event_flags & EFLAG_DEBUG_ONLY)
continue; continue;
#endif #endif
if(((*i).event_flags & (EFLAG_HEROIC | EFLAG_NORMAL)) && m_creature.GetMap()->IsDungeon() ) if(((*i).event_flags & (EFLAG_HEROIC | EFLAG_NORMAL)) && m_creature->GetMap()->IsDungeon() )
{ {
if( (m_creature.GetMap()->IsHeroic() && (*i).event_flags & EFLAG_HEROIC) || if( (m_creature->GetMap()->IsHeroic() && (*i).event_flags & EFLAG_HEROIC) ||
(!m_creature.GetMap()->IsHeroic() && (*i).event_flags & EFLAG_NORMAL)) (!m_creature->GetMap()->IsHeroic() && (*i).event_flags & EFLAG_NORMAL))
{ {
//event flagged for instance mode //event flagged for instance mode
CreatureEventAIList.push_back(CreatureEventAIHolder(*i)); CreatureEventAIList.push_back(CreatureEventAIHolder(*i));
@@ -67,10 +67,10 @@ CreatureEventAI::CreatureEventAI(Creature *c) : CreatureAI(c), m_creature(*c), I
} }
//EventMap had events but they were not added because they must be for instance //EventMap had events but they were not added because they must be for instance
if (CreatureEventAIList.empty()) if (CreatureEventAIList.empty())
sLog.outError("CreatureEventAI: CreatureId has events but no events added to list because of instance flags.", m_creature.GetEntry()); sLog.outError("CreatureEventAI: CreatureId has events but no events added to list because of instance flags.", m_creature->GetEntry());
} }
else else
sLog.outError("CreatureEventAI: EventMap for Creature %u is empty but creature is using CreatureEventAI.", m_creature.GetEntry()); sLog.outError("CreatureEventAI: EventMap for Creature %u is empty but creature is using CreatureEventAI.", m_creature->GetEntry());
bEmptyList = CreatureEventAIList.empty(); bEmptyList = CreatureEventAIList.empty();
Phase = 0; Phase = 0;
@@ -152,7 +152,7 @@ bool CreatureEventAI::ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pAction
pHolder.Time = urand(param3, param4); pHolder.Time = urand(param3, param4);
else else
{ {
sLog.outErrorDb("CreatureEventAI: Creature %u using Event %u (Type = %u) has RandomMax < RandomMin. Event repeating disabled.", m_creature.GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type); sLog.outErrorDb("CreatureEventAI: Creature %u using Event %u (Type = %u) has RandomMax < RandomMin. Event repeating disabled.", m_creature->GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type);
pHolder.Enabled = false; pHolder.Enabled = false;
} }
} }
@@ -172,17 +172,17 @@ bool CreatureEventAI::ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pAction
else else
{ {
sLog.outErrorDb("CreatureEventAI: Creature %u using Event %u (Type = %u) has RandomMax < RandomMin. Event repeating disabled.", m_creature.GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type); sLog.outErrorDb("CreatureEventAI: Creature %u using Event %u (Type = %u) has RandomMax < RandomMin. Event repeating disabled.", m_creature->GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type);
pHolder.Enabled = false; pHolder.Enabled = false;
} }
} }
break; break;
case EVENT_T_HP: case EVENT_T_HP:
{ {
if (!InCombat || !m_creature.GetMaxHealth()) if (!InCombat || !m_creature->GetMaxHealth())
return false; return false;
uint32 perc = (m_creature.GetHealth()*100) / m_creature.GetMaxHealth(); uint32 perc = (m_creature->GetHealth()*100) / m_creature->GetMaxHealth();
if (perc > param1 || perc < param2) if (perc > param1 || perc < param2)
return false; return false;
@@ -197,17 +197,17 @@ bool CreatureEventAI::ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pAction
else else
{ {
sLog.outErrorDb("CreatureEventAI: Creature %u using Event %u (Type = %u) has RandomMax < RandomMin. Event repeating disabled.", m_creature.GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type); sLog.outErrorDb("CreatureEventAI: Creature %u using Event %u (Type = %u) has RandomMax < RandomMin. Event repeating disabled.", m_creature->GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type);
pHolder.Enabled = false; pHolder.Enabled = false;
} }
} }
break; break;
case EVENT_T_MANA: case EVENT_T_MANA:
{ {
if (!InCombat || !m_creature.GetMaxPower(POWER_MANA)) if (!InCombat || !m_creature->GetMaxPower(POWER_MANA))
return false; return false;
uint32 perc = (m_creature.GetPower(POWER_MANA)*100) / m_creature.GetMaxPower(POWER_MANA); uint32 perc = (m_creature->GetPower(POWER_MANA)*100) / m_creature->GetMaxPower(POWER_MANA);
if (perc > param1 || perc < param2) if (perc > param1 || perc < param2)
return false; return false;
@@ -222,7 +222,7 @@ bool CreatureEventAI::ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pAction
else else
{ {
sLog.outErrorDb("CreatureEventAI: Creature %u using Event %u (Type = %u) has RandomMax < RandomMin. Event repeating disabled.", m_creature.GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type); sLog.outErrorDb("CreatureEventAI: Creature %u using Event %u (Type = %u) has RandomMax < RandomMin. Event repeating disabled.", m_creature->GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type);
pHolder.Enabled = false; pHolder.Enabled = false;
} }
} }
@@ -243,7 +243,7 @@ bool CreatureEventAI::ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pAction
else else
{ {
sLog.outErrorDb("CreatureEventAI: Creature %u using Event %u (Type = %u) has RandomMax < RandomMin. Event repeating disabled.", m_creature.GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type); sLog.outErrorDb("CreatureEventAI: Creature %u using Event %u (Type = %u) has RandomMax < RandomMin. Event repeating disabled.", m_creature->GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type);
pHolder.Enabled = false; pHolder.Enabled = false;
} }
} }
@@ -269,7 +269,7 @@ bool CreatureEventAI::ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pAction
else else
{ {
sLog.outErrorDb("CreatureEventAI: Creature %u using Event %u (Type = %u) has RandomMax < RandomMin. Event repeating disabled.", m_creature.GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type); sLog.outErrorDb("CreatureEventAI: Creature %u using Event %u (Type = %u) has RandomMax < RandomMin. Event repeating disabled.", m_creature->GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type);
pHolder.Enabled = false; pHolder.Enabled = false;
} }
} }
@@ -286,7 +286,7 @@ bool CreatureEventAI::ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pAction
else else
{ {
sLog.outErrorDb("CreatureEventAI: Creature %u using Event %u (Type = %u) has RandomMax < RandomMin. Event repeating disabled.", m_creature.GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type); sLog.outErrorDb("CreatureEventAI: Creature %u using Event %u (Type = %u) has RandomMax < RandomMin. Event repeating disabled.", m_creature->GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type);
pHolder.Enabled = false; pHolder.Enabled = false;
} }
} }
@@ -303,7 +303,7 @@ bool CreatureEventAI::ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pAction
else else
{ {
sLog.outErrorDb("CreatureEventAI: Creature %u using Event %u (Type = %u) has RandomMax < RandomMin. Event repeating disabled.", m_creature.GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type); sLog.outErrorDb("CreatureEventAI: Creature %u using Event %u (Type = %u) has RandomMax < RandomMin. Event repeating disabled.", m_creature->GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type);
pHolder.Enabled = false; pHolder.Enabled = false;
} }
} }
@@ -314,10 +314,10 @@ bool CreatureEventAI::ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pAction
break; break;
case EVENT_T_TARGET_HP: case EVENT_T_TARGET_HP:
{ {
if (!InCombat || !m_creature.getVictim() || !m_creature.getVictim()->GetMaxHealth()) if (!InCombat || !m_creature->getVictim() || !m_creature->getVictim()->GetMaxHealth())
return false; return false;
uint32 perc = (m_creature.getVictim()->GetHealth()*100) / m_creature.getVictim()->GetMaxHealth(); uint32 perc = (m_creature->getVictim()->GetHealth()*100) / m_creature->getVictim()->GetMaxHealth();
if (perc > param1 || perc < param2) if (perc > param1 || perc < param2)
return false; return false;
@@ -332,14 +332,14 @@ bool CreatureEventAI::ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pAction
else else
{ {
sLog.outErrorDb("CreatureEventAI: Creature %u using Event %u (Type = %u) has RandomMax < RandomMin. Event repeating disabled.", m_creature.GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type); sLog.outErrorDb("CreatureEventAI: Creature %u using Event %u (Type = %u) has RandomMax < RandomMin. Event repeating disabled.", m_creature->GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type);
pHolder.Enabled = false; pHolder.Enabled = false;
} }
} }
break; break;
case EVENT_T_TARGET_CASTING: case EVENT_T_TARGET_CASTING:
{ {
if (!InCombat || !m_creature.getVictim() || !m_creature.getVictim()->IsNonMeleeSpellCasted(false, false, true)) if (!InCombat || !m_creature->getVictim() || !m_creature->getVictim()->IsNonMeleeSpellCasted(false, false, true))
return false; return false;
//Repeat Timers //Repeat Timers
@@ -352,7 +352,7 @@ bool CreatureEventAI::ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pAction
else else
{ {
sLog.outErrorDb("CreatureEventAI: Creature %u using Event %u (Type = %u) has RandomMax < RandomMin. Event repeating disabled.", m_creature.GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type); sLog.outErrorDb("CreatureEventAI: Creature %u using Event %u (Type = %u) has RandomMax < RandomMin. Event repeating disabled.", m_creature->GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type);
pHolder.Enabled = false; pHolder.Enabled = false;
} }
} }
@@ -379,7 +379,7 @@ bool CreatureEventAI::ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pAction
else else
{ {
sLog.outErrorDb("CreatureEventAI: Creature %u using Event %u (Type = %u) has RandomMax < RandomMin. Event repeating disabled.", m_creature.GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type); sLog.outErrorDb("CreatureEventAI: Creature %u using Event %u (Type = %u) has RandomMax < RandomMin. Event repeating disabled.", m_creature->GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type);
pHolder.Enabled = false; pHolder.Enabled = false;
} }
} }
@@ -408,7 +408,7 @@ bool CreatureEventAI::ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pAction
pHolder.Time = urand(param3, param4); pHolder.Time = urand(param3, param4);
else else
{ {
sLog.outErrorDb("CreatureEventAI: Creature %u using Event %u (Type = %u) has RandomMax < RandomMin. Event repeating disabled.", m_creature.GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type); sLog.outErrorDb("CreatureEventAI: Creature %u using Event %u (Type = %u) has RandomMax < RandomMin. Event repeating disabled.", m_creature->GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type);
pHolder.Enabled = false; pHolder.Enabled = false;
} }
} }
@@ -435,7 +435,7 @@ bool CreatureEventAI::ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pAction
else else
{ {
sLog.outErrorDb("CreatureEventAI: Creature %u using Event %u (Type = %u) has RandomMax < RandomMin. Event repeating disabled.", m_creature.GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type); sLog.outErrorDb("CreatureEventAI: Creature %u using Event %u (Type = %u) has RandomMax < RandomMin. Event repeating disabled.", m_creature->GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type);
pHolder.Enabled = false; pHolder.Enabled = false;
} }
} }
@@ -460,7 +460,7 @@ bool CreatureEventAI::ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pAction
else else
{ {
sLog.outErrorDb("CreatureEventAI: Creature %u using Event %u (Type = %u) has RandomMax < RandomMin. Event repeating disabled.", m_creature.GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type); sLog.outErrorDb("CreatureEventAI: Creature %u using Event %u (Type = %u) has RandomMax < RandomMin. Event repeating disabled.", m_creature->GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type);
pHolder.Enabled = false; pHolder.Enabled = false;
} }
} }
@@ -475,7 +475,7 @@ bool CreatureEventAI::ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pAction
break; break;
default: default:
sLog.outErrorDb("CreatureEventAI: Creature %u using Event %u has invalid Event Type(%u), missing from ProcessEvent() Switch.", m_creature.GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type); sLog.outErrorDb("CreatureEventAI: Creature %u using Event %u has invalid Event Type(%u), missing from ProcessEvent() Switch.", m_creature->GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type);
break; break;
} }
@@ -532,7 +532,7 @@ void CreatureEventAI::ProcessAction(uint16 type, uint32 param1, uint32 param2, u
target = owner; target = owner;
} }
} }
else if (target = m_creature.getVictim()) else if (target = m_creature->getVictim())
{ {
if (target->GetTypeId() != TYPEID_PLAYER) if (target->GetTypeId() != TYPEID_PLAYER)
{ {
@@ -544,21 +544,21 @@ void CreatureEventAI::ProcessAction(uint16 type, uint32 param1, uint32 param2, u
} }
} }
DoScriptText(temp, &m_creature, target); DoScriptText(temp, m_creature, target);
} }
} }
break; break;
case ACTION_T_SET_FACTION: case ACTION_T_SET_FACTION:
{ {
if (param1) if (param1)
m_creature.setFaction(param1); m_creature->setFaction(param1);
else else
{ {
if (CreatureInfo const* ci = GetCreatureTemplateStore(m_creature.GetEntry())) if (CreatureInfo const* ci = GetCreatureTemplateStore(m_creature->GetEntry()))
{ {
//if no id provided, assume reset and then use default //if no id provided, assume reset and then use default
if (m_creature.getFaction() != ci->faction_A) if (m_creature->getFaction() != ci->faction_A)
m_creature.setFaction(ci->faction_A); m_creature->setFaction(ci->faction_A);
} }
} }
} }
@@ -574,29 +574,29 @@ void CreatureEventAI::ProcessAction(uint16 type, uint32 param1, uint32 param2, u
{ {
//use default display //use default display
if (ci->Modelid1) if (ci->Modelid1)
m_creature.SetDisplayId(ci->Modelid1); m_creature->SetDisplayId(ci->Modelid1);
} }
} }
//if no param1, then use value from param2 (modelId) //if no param1, then use value from param2 (modelId)
else else
m_creature.SetDisplayId(param2); m_creature->SetDisplayId(param2);
} }
else else
m_creature.DeMorph(); m_creature->DeMorph();
} }
break; break;
case ACTION_T_SOUND: case ACTION_T_SOUND:
m_creature.PlayDirectSound(param1); m_creature->PlayDirectSound(param1);
break; break;
case ACTION_T_EMOTE: case ACTION_T_EMOTE:
m_creature.HandleEmoteCommand(param1); m_creature->HandleEmoteCommand(param1);
break; break;
case ACTION_T_RANDOM_SOUND: case ACTION_T_RANDOM_SOUND:
{ {
uint32 temp = GetRandActionParam(rnd, param1, param2, param3); uint32 temp = GetRandActionParam(rnd, param1, param2, param3);
if (temp != uint32(0xffffffff)) if (temp != uint32(0xffffffff))
m_creature.PlayDirectSound( temp ); m_creature->PlayDirectSound( temp );
} }
break; break;
case ACTION_T_RANDOM_EMOTE: case ACTION_T_RANDOM_EMOTE:
@@ -604,13 +604,13 @@ void CreatureEventAI::ProcessAction(uint16 type, uint32 param1, uint32 param2, u
uint32 temp = GetRandActionParam(rnd, param1, param2, param3); uint32 temp = GetRandActionParam(rnd, param1, param2, param3);
if (temp != uint32(0xffffffff)) if (temp != uint32(0xffffffff))
m_creature.HandleEmoteCommand(temp); m_creature->HandleEmoteCommand(temp);
} }
break; break;
case ACTION_T_CAST: case ACTION_T_CAST:
{ {
Unit* target = GetTargetByType(param2, pActionInvoker); Unit* target = GetTargetByType(param2, pActionInvoker);
Unit* caster = &m_creature; Unit* caster = m_creature;
if (!target) if (!target)
return; return;
@@ -646,12 +646,12 @@ void CreatureEventAI::ProcessAction(uint16 type, uint32 param1, uint32 param2, u
//Melee current victim if flag not set //Melee current victim if flag not set
if (!(param3 & CAST_NO_MELEE_IF_OOM)) if (!(param3 & CAST_NO_MELEE_IF_OOM))
{ {
if (m_creature.GetMotionMaster()->GetCurrentMovementGeneratorType() == TARGETED_MOTION_TYPE) if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == TARGETED_MOTION_TYPE)
{ {
AttackDistance = 0; AttackDistance = 0;
AttackAngle = 0; AttackAngle = 0;
m_creature.GetMotionMaster()->MoveChase(m_creature.getVictim(), AttackDistance, AttackAngle); m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim(), AttackDistance, AttackAngle);
} }
} }
@@ -666,7 +666,7 @@ void CreatureEventAI::ProcessAction(uint16 type, uint32 param1, uint32 param2, u
} }
}else }else
sLog.outErrorDb("CreatureEventAI: event %d creature %d attempt to cast spell that doesn't exist %d", EventId, m_creature.GetEntry(), param1); sLog.outErrorDb("CreatureEventAI: event %d creature %d attempt to cast spell that doesn't exist %d", EventId, m_creature->GetEntry(), param1);
} }
} }
break; break;
@@ -677,14 +677,14 @@ void CreatureEventAI::ProcessAction(uint16 type, uint32 param1, uint32 param2, u
Creature* pCreature = NULL; Creature* pCreature = NULL;
if (param3) if (param3)
pCreature = m_creature.SummonCreature(param1, 0, 0, 0, 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, param3); pCreature = m_creature->SummonCreature(param1, 0, 0, 0, 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, param3);
else else
pCreature = m_creature.SummonCreature(param1, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0); pCreature = m_creature->SummonCreature(param1, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0);
if (!pCreature) if (!pCreature)
{ {
sLog.outErrorDb( "CreatureEventAI: failed to spawn creature %u. Spawn event %d is on creature %d", param1, EventId, m_creature.GetEntry()); sLog.outErrorDb( "CreatureEventAI: failed to spawn creature %u. Spawn event %d is on creature %d", param1, EventId, m_creature->GetEntry());
} }
else if (param2 != TARGET_T_SELF && target) else if (param2 != TARGET_T_SELF && target)
pCreature->AI()->AttackStart(target); pCreature->AI()->AttackStart(target);
@@ -695,19 +695,19 @@ void CreatureEventAI::ProcessAction(uint16 type, uint32 param1, uint32 param2, u
Unit* target = GetTargetByType(param2, pActionInvoker); Unit* target = GetTargetByType(param2, pActionInvoker);
if (target) if (target)
m_creature.getThreatManager().modifyThreatPercent(target, param1); m_creature->getThreatManager().modifyThreatPercent(target, param1);
} }
break; break;
case ACTION_T_THREAT_ALL_PCT: case ACTION_T_THREAT_ALL_PCT:
{ {
Unit* Temp = NULL; Unit* Temp = NULL;
std::list<HostilReference*>::iterator i = m_creature.getThreatManager().getThreatList().begin(); std::list<HostilReference*>::iterator i = m_creature->getThreatManager().getThreatList().begin();
for (; i != m_creature.getThreatManager().getThreatList().end(); ++i) for (; i != m_creature->getThreatManager().getThreatList().end(); ++i)
{ {
Temp = Unit::GetUnit(m_creature,(*i)->getUnitGuid()); Temp = Unit::GetUnit(*m_creature,(*i)->getUnitGuid());
if (Temp) if (Temp)
m_creature.getThreatManager().modifyThreatPercent(Temp, param1); m_creature->getThreatManager().modifyThreatPercent(Temp, param1);
} }
} }
break; break;
@@ -724,7 +724,7 @@ void CreatureEventAI::ProcessAction(uint16 type, uint32 param1, uint32 param2, u
Unit* target = GetTargetByType(param3, pActionInvoker); Unit* target = GetTargetByType(param3, pActionInvoker);
if (target && target->GetTypeId() == TYPEID_PLAYER) if (target && target->GetTypeId() == TYPEID_PLAYER)
((Player*)target)->CastedCreatureOrGO(param1, m_creature.GetGUID(), param2); ((Player*)target)->CastedCreatureOrGO(param1, m_creature->GetGUID(), param2);
} }
break; break;
case ACTION_T_SET_UNIT_FIELD: case ACTION_T_SET_UNIT_FIELD:
@@ -768,11 +768,11 @@ void CreatureEventAI::ProcessAction(uint16 type, uint32 param1, uint32 param2, u
//Allow movement (create new targeted movement gen only if idle) //Allow movement (create new targeted movement gen only if idle)
if (CombatMovementEnabled) if (CombatMovementEnabled)
{ {
m_creature.GetMotionMaster()->MoveChase(m_creature.getVictim(), AttackDistance, AttackAngle); m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim(), AttackDistance, AttackAngle);
} }
else else
{ {
m_creature.GetMotionMaster()->MoveIdle(); m_creature->GetMotionMaster()->MoveIdle();
} }
} }
break; break;
@@ -787,7 +787,7 @@ void CreatureEventAI::ProcessAction(uint16 type, uint32 param1, uint32 param2, u
if (Phase > 31) if (Phase > 31)
sLog.outErrorDb( "CreatureEventAI: Event %d incremented Phase above 31. Phase mask cannot be used with phases past 31. CreatureEntry = %d", EventId, m_creature.GetEntry()); sLog.outErrorDb( "CreatureEventAI: Event %d incremented Phase above 31. Phase mask cannot be used with phases past 31. CreatureEntry = %d", EventId, m_creature->GetEntry());
} }
break; break;
case ACTION_T_EVADE: case ACTION_T_EVADE:
@@ -797,10 +797,10 @@ void CreatureEventAI::ProcessAction(uint16 type, uint32 param1, uint32 param2, u
break; break;
case ACTION_T_FLEE: case ACTION_T_FLEE:
{ {
if(m_creature.HasAuraType(SPELL_AURA_PREVENTS_FLEEING)) if(m_creature->HasAuraType(SPELL_AURA_PREVENTS_FLEEING))
break; break;
TimetoFleeLeft = 8000; TimetoFleeLeft = 8000;
m_creature.DoFleeToGetAssistance(); m_creature->DoFleeToGetAssistance();
IsFleeing = true; IsFleeing = true;
} }
break; break;
@@ -809,9 +809,9 @@ void CreatureEventAI::ProcessAction(uint16 type, uint32 param1, uint32 param2, u
Unit* Temp = NULL; Unit* Temp = NULL;
if( pActionInvoker && pActionInvoker->GetTypeId() == TYPEID_PLAYER ) if( pActionInvoker && pActionInvoker->GetTypeId() == TYPEID_PLAYER )
{ {
Temp = Unit::GetUnit(m_creature,pActionInvoker->GetGUID()); Temp = Unit::GetUnit(*m_creature,pActionInvoker->GetGUID());
if( Temp ) if( Temp )
((Player*)Temp)->GroupEventHappens(param1,&m_creature); ((Player*)Temp)->GroupEventHappens(param1,m_creature);
} }
} }
break; break;
@@ -819,12 +819,12 @@ void CreatureEventAI::ProcessAction(uint16 type, uint32 param1, uint32 param2, u
{ {
Unit* Temp = NULL; Unit* Temp = NULL;
std::list<HostilReference*>::iterator i = m_creature.getThreatManager().getThreatList().begin(); std::list<HostilReference*>::iterator i = m_creature->getThreatManager().getThreatList().begin();
for (; i != m_creature.getThreatManager().getThreatList().end(); ++i) for (; i != m_creature->getThreatManager().getThreatList().end(); ++i)
{ {
Temp = Unit::GetUnit(m_creature,(*i)->getUnitGuid()); Temp = Unit::GetUnit(*m_creature,(*i)->getUnitGuid());
if (Temp && Temp->GetTypeId() == TYPEID_PLAYER) if (Temp && Temp->GetTypeId() == TYPEID_PLAYER)
((Player*)Temp)->CastedCreatureOrGO(param1, m_creature.GetGUID(), param2); ((Player*)Temp)->CastedCreatureOrGO(param1, m_creature->GetGUID(), param2);
} }
} }
break; break;
@@ -843,7 +843,7 @@ void CreatureEventAI::ProcessAction(uint16 type, uint32 param1, uint32 param2, u
if (CombatMovementEnabled) if (CombatMovementEnabled)
{ {
m_creature.GetMotionMaster()->MoveChase(m_creature.getVictim(), AttackDistance, AttackAngle); m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim(), AttackDistance, AttackAngle);
} }
} }
break; break;
@@ -861,7 +861,7 @@ void CreatureEventAI::ProcessAction(uint16 type, uint32 param1, uint32 param2, u
Phase = param1 + (rnd % (param2 - param1)); Phase = param1 + (rnd % (param2 - param1));
} }
else else
sLog.outErrorDb( "CreatureEventAI: ACTION_T_RANDOM_PHASE_RANGE cannot have Param2 <= Param1. Divide by Zero. Event = %d. CreatureEntry = %d", EventId, m_creature.GetEntry()); sLog.outErrorDb( "CreatureEventAI: ACTION_T_RANDOM_PHASE_RANGE cannot have Param2 <= Param1. Divide by Zero. Event = %d. CreatureEntry = %d", EventId, m_creature->GetEntry());
} }
break; break;
case ACTION_T_SUMMON_ID: case ACTION_T_SUMMON_ID:
@@ -875,18 +875,18 @@ void CreatureEventAI::ProcessAction(uint16 type, uint32 param1, uint32 param2, u
if (i == CreatureEAI_Mgr.GetCreatureEventAISummonMap().end()) if (i == CreatureEAI_Mgr.GetCreatureEventAISummonMap().end())
{ {
sLog.outErrorDb( "CreatureEventAI: failed to spawn creature %u. Summon map index %u does not exist. EventID %d. CreatureID %d", param1, param3, EventId, m_creature.GetEntry()); sLog.outErrorDb( "CreatureEventAI: failed to spawn creature %u. Summon map index %u does not exist. EventID %d. CreatureID %d", param1, param3, EventId, m_creature->GetEntry());
return; return;
} }
if ((*i).second.SpawnTimeSecs) if ((*i).second.SpawnTimeSecs)
pCreature = m_creature.SummonCreature(param1, (*i).second.position_x, (*i).second.position_y, (*i).second.position_z, (*i).second.orientation, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, (*i).second.SpawnTimeSecs); pCreature = m_creature->SummonCreature(param1, (*i).second.position_x, (*i).second.position_y, (*i).second.position_z, (*i).second.orientation, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, (*i).second.SpawnTimeSecs);
else pCreature = m_creature.SummonCreature(param1, (*i).second.position_x, (*i).second.position_y, (*i).second.position_z, (*i).second.orientation, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0); else pCreature = m_creature->SummonCreature(param1, (*i).second.position_x, (*i).second.position_y, (*i).second.position_z, (*i).second.orientation, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0);
if (!pCreature) if (!pCreature)
{ {
sLog.outErrorDb( "CreatureEventAI: failed to spawn creature %u. EventId %d.Creature %d", param1, EventId, m_creature.GetEntry()); sLog.outErrorDb( "CreatureEventAI: failed to spawn creature %u. EventId %d.Creature %d", param1, EventId, m_creature->GetEntry());
} }
else if (param2 != TARGET_T_SELF && target) else if (param2 != TARGET_T_SELF && target)
pCreature->AI()->AttackStart(target); pCreature->AI()->AttackStart(target);
@@ -895,24 +895,24 @@ void CreatureEventAI::ProcessAction(uint16 type, uint32 param1, uint32 param2, u
case ACTION_T_KILLED_MONSTER: case ACTION_T_KILLED_MONSTER:
{ {
//first attempt player who tapped creature //first attempt player who tapped creature
if (Player* pPlayer = m_creature.GetLootRecipient()) if (Player* pPlayer = m_creature->GetLootRecipient())
pPlayer->RewardPlayerAndGroupAtEvent(param1, &m_creature); pPlayer->RewardPlayerAndGroupAtEvent(param1, m_creature);
else else
{ {
//if not available, use pActionInvoker //if not available, use pActionInvoker
Unit* pTarget = GetTargetByType(param2, pActionInvoker); Unit* pTarget = GetTargetByType(param2, pActionInvoker);
if (Player* pPlayer = pTarget->GetCharmerOrOwnerPlayerOrPlayerItself()) if (Player* pPlayer = pTarget->GetCharmerOrOwnerPlayerOrPlayerItself())
pPlayer->RewardPlayerAndGroupAtEvent(param1, &m_creature); pPlayer->RewardPlayerAndGroupAtEvent(param1, m_creature);
} }
} }
break; break;
case ACTION_T_SET_INST_DATA: case ACTION_T_SET_INST_DATA:
{ {
InstanceData* pInst = (InstanceData*)m_creature.GetInstanceData(); InstanceData* pInst = (InstanceData*)m_creature->GetInstanceData();
if (!pInst) if (!pInst)
{ {
sLog.outErrorDb("CreatureEventAI: Event %d attempt to set instance data without instance script. Creature %d", EventId, m_creature.GetEntry()); sLog.outErrorDb("CreatureEventAI: Event %d attempt to set instance data without instance script. Creature %d", EventId, m_creature->GetEntry());
return; return;
} }
@@ -924,14 +924,14 @@ void CreatureEventAI::ProcessAction(uint16 type, uint32 param1, uint32 param2, u
Unit* target = GetTargetByType(param2, pActionInvoker); Unit* target = GetTargetByType(param2, pActionInvoker);
if (!target) if (!target)
{ {
sLog.outErrorDb("CreatureEventAI: Event %d attempt to set instance data64 but Target == NULL. Creature %d", EventId, m_creature.GetEntry()); sLog.outErrorDb("CreatureEventAI: Event %d attempt to set instance data64 but Target == NULL. Creature %d", EventId, m_creature->GetEntry());
return; return;
} }
InstanceData* pInst = (InstanceData*)m_creature.GetInstanceData(); InstanceData* pInst = (InstanceData*)m_creature->GetInstanceData();
if (!pInst) if (!pInst)
{ {
sLog.outErrorDb("CreatureEventAI: Event %d attempt to set instance data64 without instance script. Creature %d", EventId, m_creature.GetEntry()); sLog.outErrorDb("CreatureEventAI: Event %d attempt to set instance data64 without instance script. Creature %d", EventId, m_creature->GetEntry());
return; return;
} }
@@ -940,37 +940,37 @@ void CreatureEventAI::ProcessAction(uint16 type, uint32 param1, uint32 param2, u
break; break;
case ACTION_T_UPDATE_TEMPLATE: case ACTION_T_UPDATE_TEMPLATE:
{ {
if (m_creature.GetEntry() == param1) if (m_creature->GetEntry() == param1)
{ {
sLog.outErrorDb("CreatureEventAI: Event %d ACTION_T_UPDATE_TEMPLATE call with param1 == current entry. Creature %d", EventId, m_creature.GetEntry()); sLog.outErrorDb("CreatureEventAI: Event %d ACTION_T_UPDATE_TEMPLATE call with param1 == current entry. Creature %d", EventId, m_creature->GetEntry());
return; return;
} }
m_creature.UpdateEntry(param1, param2 ? HORDE : ALLIANCE); m_creature->UpdateEntry(param1, param2 ? HORDE : ALLIANCE);
} }
break; break;
case ACTION_T_DIE: case ACTION_T_DIE:
{ {
if (m_creature.isDead()) if (m_creature->isDead())
{ {
sLog.outErrorDb("CreatureEventAI: Event %d ACTION_T_DIE on dead creature. Creature %d", EventId, m_creature.GetEntry()); sLog.outErrorDb("CreatureEventAI: Event %d ACTION_T_DIE on dead creature. Creature %d", EventId, m_creature->GetEntry());
return; return;
} }
m_creature.DealDamage(&m_creature, m_creature.GetMaxHealth(),NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); m_creature->DealDamage(m_creature, m_creature->GetMaxHealth(),NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
} }
break; break;
case ACTION_T_ZONE_COMBAT_PULSE: case ACTION_T_ZONE_COMBAT_PULSE:
{ {
if (!m_creature.isInCombat() || !m_creature.GetMap()->IsDungeon()) if (!m_creature->isInCombat() || !m_creature->GetMap()->IsDungeon())
{ {
sLog.outErrorDb("CreatureEventAI: Event %d ACTION_T_ZONE_COMBAT_PULSE on creature out of combat or in non-dungeon map. Creature %d", EventId, m_creature.GetEntry()); sLog.outErrorDb("CreatureEventAI: Event %d ACTION_T_ZONE_COMBAT_PULSE on creature out of combat or in non-dungeon map. Creature %d", EventId, m_creature->GetEntry());
return; return;
} }
DoZoneInCombat(&m_creature); DoZoneInCombat(m_creature);
} }
break; break;
@@ -1034,7 +1034,7 @@ void CreatureEventAI::Reset()
(*i).Enabled = true; (*i).Enabled = true;
} }
else else
sLog.outErrorDb("CreatureEventAI: Creature %u using Event %u (Type = %u) has InitialMax < InitialMin. Event disabled.", m_creature.GetEntry(), (*i).Event.event_id, (*i).Event.event_type); sLog.outErrorDb("CreatureEventAI: Creature %u using Event %u (Type = %u) has InitialMax < InitialMin. Event disabled.", m_creature->GetEntry(), (*i).Event.event_id, (*i).Event.event_type);
} }
break; break;
//default: //default:
@@ -1048,7 +1048,7 @@ void CreatureEventAI::Reset()
void CreatureEventAI::JustReachedHome() void CreatureEventAI::JustReachedHome()
{ {
m_creature.LoadCreaturesAddon(); m_creature->LoadCreaturesAddon();
if (!bEmptyList) if (!bEmptyList)
{ {
@@ -1064,15 +1064,15 @@ void CreatureEventAI::JustReachedHome()
void CreatureEventAI::EnterEvadeMode() void CreatureEventAI::EnterEvadeMode()
{ {
m_creature.InterruptNonMeleeSpells(true); m_creature->InterruptNonMeleeSpells(true);
m_creature.RemoveAllAuras(); m_creature->RemoveAllAuras();
m_creature.DeleteThreatList(); m_creature->DeleteThreatList();
m_creature.CombatStop(); m_creature->CombatStop();
if (m_creature.isAlive()) if (m_creature->isAlive())
m_creature.GetMotionMaster()->MoveTargetedHome(); m_creature->GetMotionMaster()->MoveTargetedHome();
m_creature.SetLootRecipient(NULL); m_creature->SetLootRecipient(NULL);
InCombat = false; InCombat = false;
@@ -1154,7 +1154,7 @@ void CreatureEventAI::Aggro(Unit *who)
(*i).Enabled = true; (*i).Enabled = true;
} }
else else
sLog.outErrorDb("CreatureEventAI: Creature %u using Event %u (Type = %u) has InitialMax < InitialMin. Event disabled.", m_creature.GetEntry(), (*i).Event.event_id, (*i).Event.event_type); sLog.outErrorDb("CreatureEventAI: Creature %u using Event %u (Type = %u) has InitialMax < InitialMin. Event disabled.", m_creature->GetEntry(), (*i).Event.event_id, (*i).Event.event_type);
break; break;
//All normal events need to be re-enabled and their time set to 0 //All normal events need to be re-enabled and their time set to 0
default: default:
@@ -1174,7 +1174,7 @@ void CreatureEventAI::AttackStart(Unit *who)
if (!who) if (!who)
return; return;
if (m_creature.Attack(who, MeleeEnabled)) if (m_creature->Attack(who, MeleeEnabled))
{ {
if (!InCombat) if (!InCombat)
{ {
@@ -1184,11 +1184,11 @@ void CreatureEventAI::AttackStart(Unit *who)
if (CombatMovementEnabled) if (CombatMovementEnabled)
{ {
m_creature.GetMotionMaster()->MoveChase(who, AttackDistance, AttackAngle); m_creature->GetMotionMaster()->MoveChase(who, AttackDistance, AttackAngle);
} }
else else
{ {
m_creature.GetMotionMaster()->MoveIdle(); m_creature->GetMotionMaster()->MoveIdle();
} }
} }
} }
@@ -1199,7 +1199,7 @@ void CreatureEventAI::MoveInLineOfSight(Unit *who)
return; return;
//Check for OOC LOS Event //Check for OOC LOS Event
if (!bEmptyList && !m_creature.getVictim()) if (!bEmptyList && !m_creature->getVictim())
{ {
for (std::list<CreatureEventAIHolder>::iterator itr = CreatureEventAIList.begin(); itr != CreatureEventAIList.end(); ++itr) for (std::list<CreatureEventAIHolder>::iterator itr = CreatureEventAIList.begin(); itr != CreatureEventAIList.end(); ++itr)
{ {
@@ -1209,18 +1209,18 @@ void CreatureEventAI::MoveInLineOfSight(Unit *who)
float fMaxAllowedRange = (*itr).Event.event_param2; float fMaxAllowedRange = (*itr).Event.event_param2;
//if range is ok and we are actually in LOS //if range is ok and we are actually in LOS
if (m_creature.IsWithinDistInMap(who, fMaxAllowedRange) && m_creature.IsWithinLOSInMap(who)) if (m_creature->IsWithinDistInMap(who, fMaxAllowedRange) && m_creature->IsWithinLOSInMap(who))
{ {
//if friendly event&&who is not hostile OR hostile event&&who is hostile //if friendly event&&who is not hostile OR hostile event&&who is hostile
if (((*itr).Event.event_param1 && !m_creature.IsHostileTo(who)) || if (((*itr).Event.event_param1 && !m_creature->IsHostileTo(who)) ||
((!(*itr).Event.event_param1) && m_creature.IsHostileTo(who))) ((!(*itr).Event.event_param1) && m_creature->IsHostileTo(who)))
ProcessEvent(*itr, who); ProcessEvent(*itr, who);
} }
} }
} }
} }
//if (m_creature.isCivilian() && m_creature.IsNeutralToAll()) //if (m_creature->isCivilian() && m_creature->IsNeutralToAll())
// return; // return;
if(me->canStartAttack(who)) if(me->canStartAttack(who))
@@ -1253,7 +1253,7 @@ void CreatureEventAI::UpdateAI(const uint32 diff)
bool Combat = InCombat ? UpdateVictim() : false; bool Combat = InCombat ? UpdateVictim() : false;
//Must return if creature isn't alive. Normally select hostil target and get victim prevent this //Must return if creature isn't alive. Normally select hostil target and get victim prevent this
if (!m_creature.isAlive()) if (!m_creature->isAlive())
return; return;
if (IsFleeing) if (IsFleeing)
@@ -1316,9 +1316,9 @@ void CreatureEventAI::UpdateAI(const uint32 diff)
case EVENT_T_RANGE: case EVENT_T_RANGE:
if (Combat) if (Combat)
{ {
if (m_creature.IsWithinDistInMap(m_creature.getVictim(),(float)(*i).Event.event_param2)) if (m_creature->IsWithinDistInMap(m_creature->getVictim(),(float)(*i).Event.event_param2))
{ {
if (m_creature.GetDistance(m_creature.getVictim()) >= (float)(*i).Event.event_param1) if (m_creature->GetDistance(m_creature->getVictim()) >= (float)(*i).Event.event_param1)
ProcessEvent(*i); ProcessEvent(*i);
} }
} }
@@ -1344,7 +1344,7 @@ void CreatureEventAI::UpdateAI(const uint32 diff)
inline Unit* CreatureEventAI::SelectUnit(AttackingTarget target, uint32 position) inline Unit* CreatureEventAI::SelectUnit(AttackingTarget target, uint32 position)
{ {
//ThreatList m_threatlist; //ThreatList m_threatlist;
std::list<HostilReference*>& m_threatlist = m_creature.getThreatManager().getThreatList(); std::list<HostilReference*>& m_threatlist = m_creature->getThreatManager().getThreatList();
std::list<HostilReference*>::iterator i = m_threatlist.begin(); std::list<HostilReference*>::iterator i = m_threatlist.begin();
std::list<HostilReference*>::reverse_iterator r = m_threatlist.rbegin(); std::list<HostilReference*>::reverse_iterator r = m_threatlist.rbegin();
@@ -1356,17 +1356,17 @@ inline Unit* CreatureEventAI::SelectUnit(AttackingTarget target, uint32 position
case ATTACKING_TARGET_RANDOM: case ATTACKING_TARGET_RANDOM:
{ {
advance ( i , position + (rand() % (m_threatlist.size() - position ) )); advance ( i , position + (rand() % (m_threatlist.size() - position ) ));
return Unit::GetUnit(m_creature,(*i)->getUnitGuid()); return Unit::GetUnit(*m_creature,(*i)->getUnitGuid());
} }
case ATTACKING_TARGET_TOPAGGRO: case ATTACKING_TARGET_TOPAGGRO:
{ {
advance ( i , position); advance ( i , position);
return Unit::GetUnit(m_creature,(*i)->getUnitGuid()); return Unit::GetUnit(*m_creature,(*i)->getUnitGuid());
} }
case ATTACKING_TARGET_BOTTOMAGGRO: case ATTACKING_TARGET_BOTTOMAGGRO:
{ {
advance ( r , position); advance ( r , position);
return Unit::GetUnit(m_creature,(*r)->getUnitGuid()); return Unit::GetUnit(*m_creature,(*r)->getUnitGuid());
} }
} }
return NULL; return NULL;
@@ -1394,10 +1394,10 @@ inline Unit* CreatureEventAI::GetTargetByType(uint32 Target, Unit* pActionInvoke
switch (Target) switch (Target)
{ {
case TARGET_T_SELF: case TARGET_T_SELF:
return &m_creature; return m_creature;
break; break;
case TARGET_T_HOSTILE: case TARGET_T_HOSTILE:
return m_creature.getVictim(); return m_creature->getVictim();
break; break;
case TARGET_T_HOSTILE_SECOND_AGGRO: case TARGET_T_HOSTILE_SECOND_AGGRO:
return SelectUnit(ATTACKING_TARGET_TOPAGGRO,1); return SelectUnit(ATTACKING_TARGET_TOPAGGRO,1);
@@ -1422,15 +1422,15 @@ inline Unit* CreatureEventAI::GetTargetByType(uint32 Target, Unit* pActionInvoke
Unit* CreatureEventAI::DoSelectLowestHpFriendly(float range, uint32 MinHPDiff) Unit* CreatureEventAI::DoSelectLowestHpFriendly(float range, uint32 MinHPDiff)
{ {
CellPair p(MaNGOS::ComputeCellPair(m_creature.GetPositionX(), m_creature.GetPositionY())); CellPair p(MaNGOS::ComputeCellPair(m_creature->GetPositionX(), m_creature->GetPositionY()));
Cell cell(p); Cell cell(p);
cell.data.Part.reserved = ALL_DISTRICT; cell.data.Part.reserved = ALL_DISTRICT;
cell.SetNoCreate(); cell.SetNoCreate();
Unit* pUnit = NULL; Unit* pUnit = NULL;
MaNGOS::MostHPMissingInRange u_check(&m_creature, range, MinHPDiff); MaNGOS::MostHPMissingInRange u_check(m_creature, range, MinHPDiff);
MaNGOS::UnitLastSearcher<MaNGOS::MostHPMissingInRange> searcher(&m_creature, pUnit, u_check); MaNGOS::UnitLastSearcher<MaNGOS::MostHPMissingInRange> searcher(m_creature, pUnit, u_check);
/* /*
typedef TYPELIST_4(GameObject, Creature*except pets*, DynamicObject, Corpse*Bones*) AllGridObjectTypes; typedef TYPELIST_4(GameObject, Creature*except pets*, DynamicObject, Corpse*Bones*) AllGridObjectTypes;
@@ -1439,40 +1439,40 @@ Unit* CreatureEventAI::DoSelectLowestHpFriendly(float range, uint32 MinHPDiff)
TypeContainerVisitor<MaNGOS::UnitLastSearcher<MaNGOS::MostHPMissingInRange>, GridTypeMapContainer > grid_unit_searcher(searcher); TypeContainerVisitor<MaNGOS::UnitLastSearcher<MaNGOS::MostHPMissingInRange>, GridTypeMapContainer > grid_unit_searcher(searcher);
CellLock<GridReadGuard> cell_lock(cell, p); CellLock<GridReadGuard> cell_lock(cell, p);
cell_lock->Visit(cell_lock, grid_unit_searcher, *m_creature.GetMap()); cell_lock->Visit(cell_lock, grid_unit_searcher, *m_creature->GetMap());
return pUnit; return pUnit;
} }
void CreatureEventAI::DoFindFriendlyCC(std::list<Creature*>& _list, float range) void CreatureEventAI::DoFindFriendlyCC(std::list<Creature*>& _list, float range)
{ {
CellPair p(MaNGOS::ComputeCellPair(m_creature.GetPositionX(), m_creature.GetPositionY())); CellPair p(MaNGOS::ComputeCellPair(m_creature->GetPositionX(), m_creature->GetPositionY()));
Cell cell(p); Cell cell(p);
cell.data.Part.reserved = ALL_DISTRICT; cell.data.Part.reserved = ALL_DISTRICT;
cell.SetNoCreate(); cell.SetNoCreate();
MaNGOS::FriendlyCCedInRange u_check(&m_creature, range); MaNGOS::FriendlyCCedInRange u_check(m_creature, range);
MaNGOS::CreatureListSearcher<MaNGOS::FriendlyCCedInRange> searcher(&m_creature, _list, u_check); MaNGOS::CreatureListSearcher<MaNGOS::FriendlyCCedInRange> searcher(m_creature, _list, u_check);
TypeContainerVisitor<MaNGOS::CreatureListSearcher<MaNGOS::FriendlyCCedInRange>, GridTypeMapContainer > grid_creature_searcher(searcher); TypeContainerVisitor<MaNGOS::CreatureListSearcher<MaNGOS::FriendlyCCedInRange>, GridTypeMapContainer > grid_creature_searcher(searcher);
CellLock<GridReadGuard> cell_lock(cell, p); CellLock<GridReadGuard> cell_lock(cell, p);
cell_lock->Visit(cell_lock, grid_creature_searcher, *m_creature.GetMap()); cell_lock->Visit(cell_lock, grid_creature_searcher, *m_creature->GetMap());
} }
void CreatureEventAI::DoFindFriendlyMissingBuff(std::list<Creature*>& _list, float range, uint32 spellid) void CreatureEventAI::DoFindFriendlyMissingBuff(std::list<Creature*>& _list, float range, uint32 spellid)
{ {
CellPair p(MaNGOS::ComputeCellPair(m_creature.GetPositionX(), m_creature.GetPositionY())); CellPair p(MaNGOS::ComputeCellPair(m_creature->GetPositionX(), m_creature->GetPositionY()));
Cell cell(p); Cell cell(p);
cell.data.Part.reserved = ALL_DISTRICT; cell.data.Part.reserved = ALL_DISTRICT;
cell.SetNoCreate(); cell.SetNoCreate();
MaNGOS::FriendlyMissingBuffInRange u_check(&m_creature, range, spellid); MaNGOS::FriendlyMissingBuffInRange u_check(m_creature, range, spellid);
MaNGOS::CreatureListSearcher<MaNGOS::FriendlyMissingBuffInRange> searcher(&m_creature, _list, u_check); MaNGOS::CreatureListSearcher<MaNGOS::FriendlyMissingBuffInRange> searcher(m_creature, _list, u_check);
TypeContainerVisitor<MaNGOS::CreatureListSearcher<MaNGOS::FriendlyMissingBuffInRange>, GridTypeMapContainer > grid_creature_searcher(searcher); TypeContainerVisitor<MaNGOS::CreatureListSearcher<MaNGOS::FriendlyMissingBuffInRange>, GridTypeMapContainer > grid_creature_searcher(searcher);
CellLock<GridReadGuard> cell_lock(cell, p); CellLock<GridReadGuard> cell_lock(cell, p);
cell_lock->Visit(cell_lock, grid_creature_searcher, *m_creature.GetMap()); cell_lock->Visit(cell_lock, grid_creature_searcher, *m_creature->GetMap());
} }
//********************************* //*********************************
src/game/CreatureEventAI.h
+1 -5
View File
@@ -251,7 +251,7 @@ class TRINITY_DLL_SPEC CreatureEventAI : public CreatureAI
{ {
public: public:
CreatureEventAI(Creature *c); explicit CreatureEventAI(Creature *c);
~CreatureEventAI() ~CreatureEventAI()
{ {
CreatureEventAIList.clear(); CreatureEventAIList.clear();
@@ -284,12 +284,8 @@ class TRINITY_DLL_SPEC CreatureEventAI : public CreatureAI
void DoFindFriendlyMissingBuff(std::list<Creature*>& _list, float range, uint32 spellid); void DoFindFriendlyMissingBuff(std::list<Creature*>& _list, float range, uint32 spellid);
void DoFindFriendlyCC(std::list<Creature*>& _list, float range); void DoFindFriendlyCC(std::list<Creature*>& _list, float range);
//Pointer to creature we are manipulating
Creature& m_creature;
//Bool for if we are in combat or not //Bool for if we are in combat or not
bool InCombat; bool InCombat;
//Holder for events (stores enabled, time, and eventid) //Holder for events (stores enabled, time, and eventid)
std::list<CreatureEventAIHolder> CreatureEventAIList; std::list<CreatureEventAIHolder> CreatureEventAIList;
uint32 EventUpdateTime; //Time between event updates uint32 EventUpdateTime; //Time between event updates
src/game/GuardAI.cpp
+32 -32
View File
@@ -33,22 +33,22 @@ int GuardAI::Permissible(const Creature *creature)
return PERMIT_BASE_NO; return PERMIT_BASE_NO;
} }
GuardAI::GuardAI(Creature *c) : CreatureAI(c), i_creature(*c), i_victimGuid(0), i_state(STATE_NORMAL), i_tracker(TIME_INTERVAL_LOOK) GuardAI::GuardAI(Creature *c) : CreatureAI(c), i_victimGuid(0), i_state(STATE_NORMAL), i_tracker(TIME_INTERVAL_LOOK)
{ {
} }
void GuardAI::MoveInLineOfSight(Unit *u) void GuardAI::MoveInLineOfSight(Unit *u)
{ {
// Ignore Z for flying creatures // Ignore Z for flying creatures
if ( !i_creature.canFly() && i_creature.GetDistanceZ(u) > CREATURE_Z_ATTACK_RANGE ) if ( !m_creature->canFly() && m_creature->GetDistanceZ(u) > CREATURE_Z_ATTACK_RANGE )
return; return;
if( !i_creature.getVictim() && i_creature.canAttack(u) && if( !m_creature->getVictim() && m_creature->canAttack(u) &&
( u->IsHostileToPlayers() || i_creature.IsHostileTo(u) /*|| u->getVictim() && i_creature.IsFriendlyTo(u->getVictim())*/ ) && ( u->IsHostileToPlayers() || m_creature->IsHostileTo(u) /*|| u->getVictim() && m_creature->IsFriendlyTo(u->getVictim())*/ ) &&
u->isInAccessiblePlaceFor(&i_creature)) u->isInAccessiblePlaceFor(m_creature))
{ {
float attackRadius = i_creature.GetAttackDistance(u); float attackRadius = m_creature->GetAttackDistance(u);
if(i_creature.IsWithinDistInMap(u,attackRadius)) if(m_creature->IsWithinDistInMap(u,attackRadius))
{ {
//Need add code to let guard support player //Need add code to let guard support player
AttackStart(u); AttackStart(u);
@@ -59,81 +59,81 @@ void GuardAI::MoveInLineOfSight(Unit *u)
void GuardAI::EnterEvadeMode() void GuardAI::EnterEvadeMode()
{ {
if( !i_creature.isAlive() ) if( !m_creature->isAlive() )
{ {
DEBUG_LOG("Creature stopped attacking because he's dead [guid=%u]", i_creature.GetGUIDLow()); DEBUG_LOG("Creature stopped attacking because he's dead [guid=%u]", m_creature->GetGUIDLow());
i_creature.GetMotionMaster()->MoveIdle(); m_creature->GetMotionMaster()->MoveIdle();
i_state = STATE_NORMAL; i_state = STATE_NORMAL;
i_victimGuid = 0; i_victimGuid = 0;
i_creature.CombatStop(); m_creature->CombatStop();
i_creature.DeleteThreatList(); m_creature->DeleteThreatList();
return; return;
} }
Unit* victim = ObjectAccessor::GetUnit(i_creature, i_victimGuid ); Unit* victim = ObjectAccessor::GetUnit(*m_creature, i_victimGuid );
if( !victim ) if( !victim )
{ {
DEBUG_LOG("Creature stopped attacking because victim is non exist [guid=%u]", i_creature.GetGUIDLow()); DEBUG_LOG("Creature stopped attacking because victim is non exist [guid=%u]", m_creature->GetGUIDLow());
} }
else if( !victim ->isAlive() ) else if( !victim ->isAlive() )
{ {
DEBUG_LOG("Creature stopped attacking because victim is dead [guid=%u]", i_creature.GetGUIDLow()); DEBUG_LOG("Creature stopped attacking because victim is dead [guid=%u]", m_creature->GetGUIDLow());
} }
else if( victim ->HasStealthAura() ) else if( victim ->HasStealthAura() )
{ {
DEBUG_LOG("Creature stopped attacking because victim is using stealth [guid=%u]", i_creature.GetGUIDLow()); DEBUG_LOG("Creature stopped attacking because victim is using stealth [guid=%u]", m_creature->GetGUIDLow());
} }
else if( victim ->isInFlight() ) else if( victim ->isInFlight() )
{ {
DEBUG_LOG("Creature stopped attacking because victim is flying away [guid=%u]", i_creature.GetGUIDLow()); DEBUG_LOG("Creature stopped attacking because victim is flying away [guid=%u]", m_creature->GetGUIDLow());
} }
else else
{ {
DEBUG_LOG("Creature stopped attacking because victim outran him [guid=%u]", i_creature.GetGUIDLow()); DEBUG_LOG("Creature stopped attacking because victim outran him [guid=%u]", m_creature->GetGUIDLow());
} }
i_creature.RemoveAllAuras(); m_creature->RemoveAllAuras();
i_creature.DeleteThreatList(); m_creature->DeleteThreatList();
i_victimGuid = 0; i_victimGuid = 0;
i_creature.CombatStop(); m_creature->CombatStop();
i_state = STATE_NORMAL; i_state = STATE_NORMAL;
// Remove TargetedMovementGenerator from MotionMaster stack list, and add HomeMovementGenerator instead // Remove TargetedMovementGenerator from MotionMaster stack list, and add HomeMovementGenerator instead
if( i_creature.GetMotionMaster()->GetCurrentMovementGeneratorType() == TARGETED_MOTION_TYPE ) if( m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == TARGETED_MOTION_TYPE )
i_creature.GetMotionMaster()->MoveTargetedHome(); m_creature->GetMotionMaster()->MoveTargetedHome();
} }
void GuardAI::UpdateAI(const uint32 /*diff*/) void GuardAI::UpdateAI(const uint32 /*diff*/)
{ {
// update i_victimGuid if i_creature.getVictim() !=0 and changed // update i_victimGuid if m_creature->getVictim() !=0 and changed
if(!UpdateVictim()) if(!UpdateVictim())
return; return;
i_victimGuid = i_creature.getVictim()->GetGUID(); i_victimGuid = m_creature->getVictim()->GetGUID();
if( i_creature.isAttackReady() ) if( m_creature->isAttackReady() )
{ {
if( i_creature.IsWithinMeleeRange(i_creature.getVictim())) if( m_creature->IsWithinMeleeRange(m_creature->getVictim()))
{ {
i_creature.AttackerStateUpdate(i_creature.getVictim()); m_creature->AttackerStateUpdate(m_creature->getVictim());
i_creature.resetAttackTimer(); m_creature->resetAttackTimer();
} }
} }
} }
bool GuardAI::IsVisible(Unit *pl) const bool GuardAI::IsVisible(Unit *pl) const
{ {
return i_creature.GetDistance(pl) < sWorld.getConfig(CONFIG_SIGHT_GUARDER) return m_creature->GetDistance(pl) < sWorld.getConfig(CONFIG_SIGHT_GUARDER)
&& pl->isVisibleForOrDetect(&i_creature,true); && pl->isVisibleForOrDetect(m_creature,true);
} }
void GuardAI::JustDied(Unit *killer) void GuardAI::JustDied(Unit *killer)
{ {
if(Player* pkiller = killer->GetCharmerOrOwnerPlayerOrPlayerItself()) if(Player* pkiller = killer->GetCharmerOrOwnerPlayerOrPlayerItself())
i_creature.SendZoneUnderAttackMessage(pkiller); m_creature->SendZoneUnderAttackMessage(pkiller);
} }
src/game/GuardAI.h
+1 -2
View File
@@ -36,7 +36,7 @@ class TRINITY_DLL_DECL GuardAI : public CreatureAI
public: public:
GuardAI(Creature *c); explicit GuardAI(Creature *c);
void MoveInLineOfSight(Unit *); void MoveInLineOfSight(Unit *);
void EnterEvadeMode(); void EnterEvadeMode();
@@ -47,7 +47,6 @@ class TRINITY_DLL_DECL GuardAI : public CreatureAI
static int Permissible(const Creature *); static int Permissible(const Creature *);
private: private:
Creature &i_creature;
uint64 i_victimGuid; uint64 i_victimGuid;
GuardState i_state; GuardState i_state;
TimeTracker i_tracker; TimeTracker i_tracker;
src/game/NullCreatureAI.h
+4 -4
View File
@@ -26,7 +26,7 @@
class TRINITY_DLL_DECL PassiveAI : public CreatureAI class TRINITY_DLL_DECL PassiveAI : public CreatureAI
{ {
public: public:
PassiveAI(Creature *c) : CreatureAI(c) {} explicit PassiveAI(Creature *c) : CreatureAI(c) {}
~PassiveAI() {} ~PassiveAI() {}
void MoveInLineOfSight(Unit *) {} void MoveInLineOfSight(Unit *) {}
@@ -39,7 +39,7 @@ class TRINITY_DLL_DECL PassiveAI : public CreatureAI
class TRINITY_DLL_DECL PossessedAI : public PassiveAI class TRINITY_DLL_DECL PossessedAI : public PassiveAI
{ {
public: public:
PossessedAI(Creature *c) : PassiveAI(c) {} explicit PossessedAI(Creature *c) : PassiveAI(c) {}
void AttackStart(Unit *target); void AttackStart(Unit *target);
void UpdateAI(const uint32); void UpdateAI(const uint32);
@@ -52,7 +52,7 @@ class TRINITY_DLL_DECL PossessedAI : public PassiveAI
class TRINITY_DLL_DECL NullCreatureAI : public PassiveAI class TRINITY_DLL_DECL NullCreatureAI : public PassiveAI
{ {
public: public:
NullCreatureAI(Creature *c) : PassiveAI(c) {} explicit NullCreatureAI(Creature *c) : PassiveAI(c) {}
void UpdateAI(const uint32) {} void UpdateAI(const uint32) {}
void EnterEvadeMode() {} void EnterEvadeMode() {}
@@ -61,7 +61,7 @@ class TRINITY_DLL_DECL NullCreatureAI : public PassiveAI
class TRINITY_DLL_DECL CritterAI : public PassiveAI class TRINITY_DLL_DECL CritterAI : public PassiveAI
{ {
public: public:
CritterAI(Creature *c) : PassiveAI(c) {} explicit CritterAI(Creature *c) : PassiveAI(c) {}
void DamageTaken(Unit *done_by, uint32 & /*damage*/); void DamageTaken(Unit *done_by, uint32 & /*damage*/);
void EnterEvadeMode(); void EnterEvadeMode();
src/game/OutdoorPvPObjectiveAI.h
+1 -1
View File
@@ -26,7 +26,7 @@ class Creature;
class TRINITY_DLL_DECL OutdoorPvPObjectiveAI : public NullCreatureAI class TRINITY_DLL_DECL OutdoorPvPObjectiveAI : public NullCreatureAI
{ {
public: public:
OutdoorPvPObjectiveAI(Creature *c); explicit OutdoorPvPObjectiveAI(Creature *c);
void MoveInLineOfSight(Unit *); void MoveInLineOfSight(Unit *);
src/game/PetAI.cpp
+41 -41
View File
@@ -38,7 +38,7 @@ int PetAI::Permissible(const Creature *creature)
return PERMIT_BASE_NO; return PERMIT_BASE_NO;
} }
PetAI::PetAI(Creature *c) : CreatureAI(c), i_pet(*c), i_tracker(TIME_INTERVAL_LOOK) PetAI::PetAI(Creature *c) : CreatureAI(c), i_tracker(TIME_INTERVAL_LOOK)
{ {
m_AllySet.clear(); m_AllySet.clear();
UpdateAllies(); UpdateAllies();
@@ -51,46 +51,46 @@ void PetAI::EnterEvadeMode()
bool PetAI::_needToStop() const bool PetAI::_needToStop() const
{ {
// This is needed for charmed creatures, as once their target was reset other effects can trigger threat // This is needed for charmed creatures, as once their target was reset other effects can trigger threat
if(i_pet.isCharmed() && i_pet.getVictim() == i_pet.GetCharmer()) if(m_creature->isCharmed() && m_creature->getVictim() == m_creature->GetCharmer())
return true; return true;
return !i_pet.canAttack(i_pet.getVictim()); return !m_creature->canAttack(m_creature->getVictim());
} }
void PetAI::_stopAttack() void PetAI::_stopAttack()
{ {
if( !i_pet.isAlive() ) if( !m_creature->isAlive() )
{ {
DEBUG_LOG("Creature stoped attacking cuz his dead [guid=%u]", i_pet.GetGUIDLow()); DEBUG_LOG("Creature stoped attacking cuz his dead [guid=%u]", m_creature->GetGUIDLow());
i_pet.GetMotionMaster()->Clear(); m_creature->GetMotionMaster()->Clear();
i_pet.GetMotionMaster()->MoveIdle(); m_creature->GetMotionMaster()->MoveIdle();
i_pet.CombatStop(); m_creature->CombatStop();
i_pet.getHostilRefManager().deleteReferences(); m_creature->getHostilRefManager().deleteReferences();
return; return;
} }
Unit* owner = i_pet.GetCharmerOrOwner(); Unit* owner = m_creature->GetCharmerOrOwner();
if(owner && i_pet.GetCharmInfo() && i_pet.GetCharmInfo()->HasCommandState(COMMAND_FOLLOW)) if(owner && m_creature->GetCharmInfo() && m_creature->GetCharmInfo()->HasCommandState(COMMAND_FOLLOW))
{ {
i_pet.GetMotionMaster()->MoveFollow(owner,PET_FOLLOW_DIST,PET_FOLLOW_ANGLE); m_creature->GetMotionMaster()->MoveFollow(owner,PET_FOLLOW_DIST,PET_FOLLOW_ANGLE);
} }
else else
{ {
i_pet.clearUnitState(UNIT_STAT_FOLLOW); m_creature->clearUnitState(UNIT_STAT_FOLLOW);
i_pet.GetMotionMaster()->Clear(); m_creature->GetMotionMaster()->Clear();
i_pet.GetMotionMaster()->MoveIdle(); m_creature->GetMotionMaster()->MoveIdle();
} }
i_pet.AttackStop(); m_creature->AttackStop();
} }
void PetAI::UpdateAI(const uint32 diff) void PetAI::UpdateAI(const uint32 diff)
{ {
if (!i_pet.isAlive()) if (!m_creature->isAlive())
return; return;
Unit* owner = i_pet.GetCharmerOrOwner(); Unit* owner = m_creature->GetCharmerOrOwner();
if(m_updateAlliesTimer <= diff) if(m_updateAlliesTimer <= diff)
// UpdateAllies self set update timer // UpdateAllies self set update timer
@@ -98,12 +98,12 @@ void PetAI::UpdateAI(const uint32 diff)
else else
m_updateAlliesTimer -= diff; m_updateAlliesTimer -= diff;
// i_pet.getVictim() can't be used for check in case stop fighting, i_pet.getVictim() clear at Unit death etc. // m_creature->getVictim() can't be used for check in case stop fighting, m_creature->getVictim() clear at Unit death etc.
if( i_pet.getVictim() ) if( m_creature->getVictim() )
{ {
if( _needToStop() ) if( _needToStop() )
{ {
DEBUG_LOG("Pet AI stoped attacking [guid=%u]", i_pet.GetGUIDLow()); DEBUG_LOG("Pet AI stoped attacking [guid=%u]", m_creature->GetGUIDLow());
_stopAttack(); _stopAttack();
return; return;
} }
@@ -114,26 +114,26 @@ void PetAI::UpdateAI(const uint32 diff)
{ {
if(me->isInCombat()) if(me->isInCombat())
_stopAttack(); _stopAttack();
else if(owner && i_pet.GetCharmInfo()) //no victim else if(owner && m_creature->GetCharmInfo()) //no victim
{ {
if(owner->isInCombat() && !(i_pet.HasReactState(REACT_PASSIVE) || i_pet.GetCharmInfo()->HasCommandState(COMMAND_STAY))) if(owner->isInCombat() && !(m_creature->HasReactState(REACT_PASSIVE) || m_creature->GetCharmInfo()->HasCommandState(COMMAND_STAY)))
AttackStart(owner->getAttackerForHelper()); AttackStart(owner->getAttackerForHelper());
else if(i_pet.GetCharmInfo()->HasCommandState(COMMAND_FOLLOW) && !i_pet.hasUnitState(UNIT_STAT_FOLLOW)) else if(m_creature->GetCharmInfo()->HasCommandState(COMMAND_FOLLOW) && !m_creature->hasUnitState(UNIT_STAT_FOLLOW))
i_pet.GetMotionMaster()->MoveFollow(owner,PET_FOLLOW_DIST,PET_FOLLOW_ANGLE); m_creature->GetMotionMaster()->MoveFollow(owner,PET_FOLLOW_DIST,PET_FOLLOW_ANGLE);
} }
} }
if(!me->GetCharmInfo()) if(!me->GetCharmInfo())
return; return;
if (i_pet.GetGlobalCooldown() == 0 && !i_pet.hasUnitState(UNIT_STAT_CASTING)) if (m_creature->GetGlobalCooldown() == 0 && !m_creature->hasUnitState(UNIT_STAT_CASTING))
{ {
bool inCombat = me->getVictim(); bool inCombat = me->getVictim();
//Autocast //Autocast
for (uint8 i = 0; i < i_pet.GetPetAutoSpellSize(); i++) for (uint8 i = 0; i < m_creature->GetPetAutoSpellSize(); i++)
{ {
uint32 spellID = i_pet.GetPetAutoSpellOnPos(i); uint32 spellID = m_creature->GetPetAutoSpellOnPos(i);
if (!spellID) if (!spellID)
continue; continue;
@@ -153,11 +153,11 @@ void PetAI::UpdateAI(const uint32 diff)
continue; continue;
} }
Spell *spell = new Spell(&i_pet, spellInfo, false, 0); Spell *spell = new Spell(m_creature, spellInfo, false, 0);
if(inCombat && !i_pet.hasUnitState(UNIT_STAT_FOLLOW) && spell->CanAutoCast(i_pet.getVictim())) if(inCombat && !m_creature->hasUnitState(UNIT_STAT_FOLLOW) && spell->CanAutoCast(m_creature->getVictim()))
{ {
m_targetSpellStore.push_back(std::make_pair<Unit*, Spell*>(i_pet.getVictim(), spell)); m_targetSpellStore.push_back(std::make_pair<Unit*, Spell*>(m_creature->getVictim(), spell));
continue; continue;
} }
else else
@@ -165,7 +165,7 @@ void PetAI::UpdateAI(const uint32 diff)
bool spellUsed = false; bool spellUsed = false;
for(std::set<uint64>::iterator tar = m_AllySet.begin(); tar != m_AllySet.end(); ++tar) for(std::set<uint64>::iterator tar = m_AllySet.begin(); tar != m_AllySet.end(); ++tar)
{ {
Unit* Target = ObjectAccessor::GetUnit(i_pet,*tar); Unit* Target = ObjectAccessor::GetUnit(*m_creature,*tar);
//only buff targets that are in combat, unless the spell can only be cast while out of combat //only buff targets that are in combat, unless the spell can only be cast while out of combat
if(!Target) if(!Target)
@@ -196,19 +196,19 @@ void PetAI::UpdateAI(const uint32 diff)
SpellCastTargets targets; SpellCastTargets targets;
targets.setUnitTarget( target ); targets.setUnitTarget( target );
if( !i_pet.HasInArc(M_PI, target) ) if( !m_creature->HasInArc(M_PI, target) )
{ {
i_pet.SetInFront(target); m_creature->SetInFront(target);
if( target->GetTypeId() == TYPEID_PLAYER ) if( target->GetTypeId() == TYPEID_PLAYER )
i_pet.SendUpdateToPlayer( (Player*)target ); m_creature->SendUpdateToPlayer( (Player*)target );
if(owner && owner->GetTypeId() == TYPEID_PLAYER) if(owner && owner->GetTypeId() == TYPEID_PLAYER)
i_pet.SendUpdateToPlayer( (Player*)owner ); m_creature->SendUpdateToPlayer( (Player*)owner );
} }
i_pet.AddCreatureSpellCooldown(spell->m_spellInfo->Id); m_creature->AddCreatureSpellCooldown(spell->m_spellInfo->Id);
if(i_pet.isPet()) if(m_creature->isPet())
((Pet*)&i_pet)->CheckLearning(spell->m_spellInfo->Id); ((Pet*)m_creature)->CheckLearning(spell->m_spellInfo->Id);
spell->prepare(&targets); spell->prepare(&targets);
} }
@@ -222,7 +222,7 @@ void PetAI::UpdateAI(const uint32 diff)
void PetAI::UpdateAllies() void PetAI::UpdateAllies()
{ {
Unit* owner = i_pet.GetCharmerOrOwner(); Unit* owner = m_creature->GetCharmerOrOwner();
Group *pGroup = NULL; Group *pGroup = NULL;
m_updateAlliesTimer = 10*IN_MILISECONDS; //update friendly targets every 10 seconds, lesser checks increase performance m_updateAlliesTimer = 10*IN_MILISECONDS; //update friendly targets every 10 seconds, lesser checks increase performance
@@ -240,7 +240,7 @@ void PetAI::UpdateAllies()
return; return;
m_AllySet.clear(); m_AllySet.clear();
m_AllySet.insert(i_pet.GetGUID()); m_AllySet.insert(m_creature->GetGUID());
if(pGroup) //add group if(pGroup) //add group
{ {
for(GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) for(GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
src/game/PetAI.h
+1 -2
View File
@@ -31,7 +31,7 @@ class TRINITY_DLL_DECL PetAI : public CreatureAI
{ {
public: public:
PetAI(Creature *c); explicit PetAI(Creature *c);
void EnterEvadeMode(); void EnterEvadeMode();
void JustDied(Unit* who) { _stopAttack(); } void JustDied(Unit* who) { _stopAttack(); }
@@ -46,7 +46,6 @@ class TRINITY_DLL_DECL PetAI : public CreatureAI
void UpdateAllies(); void UpdateAllies();
Creature &i_pet;
TimeTracker i_tracker; TimeTracker i_tracker;
std::set<uint64> m_AllySet; std::set<uint64> m_AllySet;
uint32 m_updateAlliesTimer; uint32 m_updateAlliesTimer;
src/game/ReactorAI.cpp
+26 -26
View File
@@ -50,18 +50,18 @@ ReactorAI::IsVisible(Unit *) const
void void
ReactorAI::UpdateAI(const uint32 /*time_diff*/) ReactorAI::UpdateAI(const uint32 /*time_diff*/)
{ {
// update i_victimGuid if i_creature.getVictim() !=0 and changed // update i_victimGuid if m_creature->getVictim() !=0 and changed
if(!UpdateVictim()) if(!UpdateVictim())
return; return;
i_victimGuid = i_creature.getVictim()->GetGUID(); i_victimGuid = m_creature->getVictim()->GetGUID();
if( i_creature.isAttackReady() ) if( m_creature->isAttackReady() )
{ {
if( i_creature.IsWithinMeleeRange(i_creature.getVictim())) if( m_creature->IsWithinMeleeRange(m_creature->getVictim()))
{ {
i_creature.AttackerStateUpdate(i_creature.getVictim()); m_creature->AttackerStateUpdate(m_creature->getVictim());
i_creature.resetAttackTimer(); m_creature->resetAttackTimer();
} }
} }
} }
@@ -69,49 +69,49 @@ ReactorAI::UpdateAI(const uint32 /*time_diff*/)
void void
ReactorAI::EnterEvadeMode() ReactorAI::EnterEvadeMode()
{ {
if( !i_creature.isAlive() ) if( !m_creature->isAlive() )
{ {
DEBUG_LOG("Creature stoped attacking cuz his dead [guid=%u]", i_creature.GetGUIDLow()); DEBUG_LOG("Creature stoped attacking cuz his dead [guid=%u]", m_creature->GetGUIDLow());
i_creature.GetMotionMaster()->MovementExpired(); m_creature->GetMotionMaster()->MovementExpired();
i_creature.GetMotionMaster()->MoveIdle(); m_creature->GetMotionMaster()->MoveIdle();
i_victimGuid = 0; i_victimGuid = 0;
i_creature.CombatStop(); m_creature->CombatStop();
i_creature.DeleteThreatList(); m_creature->DeleteThreatList();
return; return;
} }
Unit* victim = ObjectAccessor::GetUnit(i_creature, i_victimGuid ); Unit* victim = ObjectAccessor::GetUnit(*m_creature, i_victimGuid );
if( !victim ) if( !victim )
{ {
DEBUG_LOG("Creature stopped attacking because victim is non exist [guid=%u]", i_creature.GetGUIDLow()); DEBUG_LOG("Creature stopped attacking because victim is non exist [guid=%u]", m_creature->GetGUIDLow());
} }
else if( victim->HasStealthAura() ) else if( victim->HasStealthAura() )
{ {
DEBUG_LOG("Creature stopped attacking cuz his victim is stealth [guid=%u]", i_creature.GetGUIDLow()); DEBUG_LOG("Creature stopped attacking cuz his victim is stealth [guid=%u]", m_creature->GetGUIDLow());
} }
else if( victim->isInFlight() ) else if( victim->isInFlight() )
{ {
DEBUG_LOG("Creature stopped attacking cuz his victim is fly away [guid=%u]", i_creature.GetGUIDLow()); DEBUG_LOG("Creature stopped attacking cuz his victim is fly away [guid=%u]", m_creature->GetGUIDLow());
} }
else else
{ {
DEBUG_LOG("Creature stopped attacking due to target %s [guid=%u]", victim->isAlive() ? "out run him" : "is dead", i_creature.GetGUIDLow()); DEBUG_LOG("Creature stopped attacking due to target %s [guid=%u]", victim->isAlive() ? "out run him" : "is dead", m_creature->GetGUIDLow());
} }
i_creature.RemoveAllAuras(); m_creature->RemoveAllAuras();
i_creature.DeleteThreatList(); m_creature->DeleteThreatList();
i_victimGuid = 0; i_victimGuid = 0;
i_creature.CombatStop(); m_creature->CombatStop();
i_creature.SetLootRecipient(NULL); m_creature->SetLootRecipient(NULL);
if(!i_creature.GetCharmerOrOwner()) if(!m_creature->GetCharmerOrOwner())
{ {
// Remove TargetedMovementGenerator from MotionMaster stack list, and add HomeMovementGenerator instead // Remove TargetedMovementGenerator from MotionMaster stack list, and add HomeMovementGenerator instead
if( i_creature.GetMotionMaster()->GetCurrentMovementGeneratorType() == TARGETED_MOTION_TYPE ) if( m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == TARGETED_MOTION_TYPE )
i_creature.GetMotionMaster()->MoveTargetedHome(); m_creature->GetMotionMaster()->MoveTargetedHome();
} }
else if (i_creature.GetOwner() && i_creature.GetOwner()->isAlive()) else if (m_creature->GetOwner() && m_creature->GetOwner()->isAlive())
i_creature.GetMotionMaster()->MoveFollow(i_creature.GetOwner(),PET_FOLLOW_DIST,PET_FOLLOW_ANGLE); m_creature->GetMotionMaster()->MoveFollow(m_creature->GetOwner(),PET_FOLLOW_DIST,PET_FOLLOW_ANGLE);
} }
src/game/ReactorAI.h
+1 -2
View File
@@ -29,7 +29,7 @@ class TRINITY_DLL_DECL ReactorAI : public CreatureAI
{ {
public: public:
ReactorAI(Creature *c) : CreatureAI(c), i_creature(*c), i_victimGuid(0) {} explicit ReactorAI(Creature *c) : CreatureAI(c), i_victimGuid(0) {}
void MoveInLineOfSight(Unit *); void MoveInLineOfSight(Unit *);
void EnterEvadeMode(); void EnterEvadeMode();
@@ -39,7 +39,6 @@ class TRINITY_DLL_DECL ReactorAI : public CreatureAI
static int Permissible(const Creature *); static int Permissible(const Creature *);
private: private:
Creature &i_creature;
uint64 i_victimGuid; uint64 i_victimGuid;
}; };
#endif #endif
src/game/TotemAI.cpp
+19 -18
View File
@@ -38,8 +38,9 @@ TotemAI::Permissible(const Creature *creature)
return PERMIT_BASE_NO; return PERMIT_BASE_NO;
} }
TotemAI::TotemAI(Creature *c) : CreatureAI(c), i_totem(static_cast<Totem&>(*c)), i_victimGuid(0) TotemAI::TotemAI(Creature *c) : CreatureAI(c), i_victimGuid(0)
{ {
assert(c->isTotem());
} }
void void
@@ -49,20 +50,20 @@ TotemAI::MoveInLineOfSight(Unit *)
void TotemAI::EnterEvadeMode() void TotemAI::EnterEvadeMode()
{ {
i_totem.CombatStop(); m_creature->CombatStop();
} }
void void
TotemAI::UpdateAI(const uint32 /*diff*/) TotemAI::UpdateAI(const uint32 /*diff*/)
{ {
if (i_totem.GetTotemType() != TOTEM_ACTIVE) if (((Totem*)m_creature)->GetTotemType() != TOTEM_ACTIVE)
return; return;
if (!i_totem.isAlive() || i_totem.IsNonMeleeSpellCasted(false)) if (!m_creature->isAlive() || m_creature->IsNonMeleeSpellCasted(false))
return; return;
// Search spell // Search spell
SpellEntry const *spellInfo = sSpellStore.LookupEntry(i_totem.GetSpell()); SpellEntry const *spellInfo = sSpellStore.LookupEntry(((Totem*)m_creature)->GetSpell());
if (!spellInfo) if (!spellInfo)
return; return;
@@ -73,17 +74,17 @@ TotemAI::UpdateAI(const uint32 /*diff*/)
// SPELLMOD_RANGE not applied in this place just because not existence range mods for attacking totems // SPELLMOD_RANGE not applied in this place just because not existence range mods for attacking totems
// pointer to appropriate target if found any // pointer to appropriate target if found any
Unit* victim = i_victimGuid ? ObjectAccessor::GetUnit(i_totem, i_victimGuid) : NULL; Unit* victim = i_victimGuid ? ObjectAccessor::GetUnit(*m_creature, i_victimGuid) : NULL;
// Search victim if no, not attackable, or out of range, or friendly (possible in case duel end) // Search victim if no, not attackable, or out of range, or friendly (possible in case duel end)
if( !victim || if( !victim ||
!victim->isTargetableForAttack() || !i_totem.IsWithinDistInMap(victim, max_range) || !victim->isTargetableForAttack() || !m_creature->IsWithinDistInMap(victim, max_range) ||
i_totem.IsFriendlyTo(victim) || !victim->isVisibleForOrDetect(&i_totem,false) ) m_creature->IsFriendlyTo(victim) || !victim->isVisibleForOrDetect(m_creature,false) )
{ {
victim = NULL; victim = NULL;
Trinity::NearestAttackableUnitInObjectRangeCheck u_check(&i_totem, &i_totem, max_range); Trinity::NearestAttackableUnitInObjectRangeCheck u_check(m_creature, m_creature, max_range);
Trinity::UnitLastSearcher<Trinity::NearestAttackableUnitInObjectRangeCheck> checker(&i_totem, victim, u_check); Trinity::UnitLastSearcher<Trinity::NearestAttackableUnitInObjectRangeCheck> checker(m_creature, victim, u_check);
i_totem.VisitNearbyObject(max_range, checker); m_creature->VisitNearbyObject(max_range, checker);
} }
// If have target // If have target
@@ -93,8 +94,8 @@ TotemAI::UpdateAI(const uint32 /*diff*/)
i_victimGuid = victim->GetGUID(); i_victimGuid = victim->GetGUID();
// attack // attack
i_totem.SetInFront(victim); // client change orientation by self m_creature->SetInFront(victim); // client change orientation by self
i_totem.CastSpell(victim, i_totem.GetSpell(), false); m_creature->CastSpell(victim, ((Totem*)m_creature)->GetSpell(), false);
} }
else else
i_victimGuid = 0; i_victimGuid = 0;
@@ -110,13 +111,13 @@ void
TotemAI::AttackStart(Unit *) TotemAI::AttackStart(Unit *)
{ {
// Sentry totem sends ping on attack // Sentry totem sends ping on attack
if (i_totem.GetEntry() == SENTRY_TOTEM_ENTRY && i_totem.GetOwner()->GetTypeId() == TYPEID_PLAYER) if (m_creature->GetEntry() == SENTRY_TOTEM_ENTRY && m_creature->GetOwner()->GetTypeId() == TYPEID_PLAYER)
{ {
WorldPacket data(MSG_MINIMAP_PING, (8+4+4)); WorldPacket data(MSG_MINIMAP_PING, (8+4+4));
data << i_totem.GetGUID(); data << m_creature->GetGUID();
data << i_totem.GetPositionX(); data << m_creature->GetPositionX();
data << i_totem.GetPositionY(); data << m_creature->GetPositionY();
((Player*)i_totem.GetOwner())->GetSession()->SendPacket(&data); ((Player*)m_creature->GetOwner())->GetSession()->SendPacket(&data);
} }
} }
src/game/TotemAI.h
+3 -2
View File
@@ -31,7 +31,7 @@ class TRINITY_DLL_DECL TotemAI : public CreatureAI
{ {
public: public:
TotemAI(Creature *c); explicit TotemAI(Creature *c);
void MoveInLineOfSight(Unit *); void MoveInLineOfSight(Unit *);
void AttackStart(Unit *); void AttackStart(Unit *);
@@ -40,9 +40,10 @@ class TRINITY_DLL_DECL TotemAI : public CreatureAI
void UpdateAI(const uint32); void UpdateAI(const uint32);
static int Permissible(const Creature *); static int Permissible(const Creature *);
protected:
Totem& getTotem();
private: private:
Totem &i_totem;
uint64 i_victimGuid; uint64 i_victimGuid;
}; };
#endif #endif