diff options
Diffstat (limited to 'src/bindings/scripts/include')
| -rw-r--r-- | src/bindings/scripts/include/sc_creature.cpp | 10 | ||||
| -rw-r--r-- | src/bindings/scripts/include/sc_creature.h | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/bindings/scripts/include/sc_creature.cpp b/src/bindings/scripts/include/sc_creature.cpp index bc1d38b58b6..7e981c89912 100644 --- a/src/bindings/scripts/include/sc_creature.cpp +++ b/src/bindings/scripts/include/sc_creature.cpp @@ -164,7 +164,7 @@ Creature* ScriptedAI::DoSpawnCreature(uint32 uiId, float fX, float fY, float fZ, return m_creature->SummonCreature(uiId, m_creature->GetPositionX()+fX, m_creature->GetPositionY()+fY, m_creature->GetPositionZ()+fZ, fAngle, (TempSummonType)uiType, uiDespawntime); } -Unit* ScriptedAI::SelectUnit(SelectAggroTarget target, uint32 uiPosition) +Unit* ScriptedAI::SelectUnit(SelectAggroTarget pTarget, uint32 uiPosition) { //ThreatList m_threatlist; std::list<HostilReference*>& threatlist = m_creature->getThreatManager().getThreatList(); @@ -174,7 +174,7 @@ Unit* ScriptedAI::SelectUnit(SelectAggroTarget target, uint32 uiPosition) if (uiPosition >= threatlist.size() || !threatlist.size()) return NULL; - switch (target) + switch (pTarget) { case SELECT_TARGET_RANDOM: advance (itr , uiPosition + (rand() % (threatlist.size() - uiPosition ) )); @@ -197,7 +197,7 @@ Unit* ScriptedAI::SelectUnit(SelectAggroTarget target, uint32 uiPosition) SpellEntry const* ScriptedAI::SelectSpell(Unit* pTarget, int32 uiSchool, int32 uiMechanic, SelectTargetType selectTargets, uint32 uiPowerCostMin, uint32 uiPowerCostMax, float fRangeMin, float fRangeMax, SelectEffect selectEffects) { - //No target so we can't cast + //No pTarget so we can't cast if (!pTarget) return false; @@ -264,7 +264,7 @@ SpellEntry const* ScriptedAI::SelectSpell(Unit* pTarget, int32 uiSchool, int32 u if (fRangeMax && m_creature->GetSpellMaxRangeForTarget(pTarget, pTempRange) > fRangeMax) continue; - //Check if our target is in range + //Check if our pTarget is in range if (m_creature->IsWithinDistInMap(pTarget, m_creature->GetSpellMinRangeForTarget(pTarget, pTempRange)) || !m_creature->IsWithinDistInMap(pTarget, m_creature->GetSpellMaxRangeForTarget(pTarget, pTempRange))) continue; @@ -282,7 +282,7 @@ SpellEntry const* ScriptedAI::SelectSpell(Unit* pTarget, int32 uiSchool, int32 u bool ScriptedAI::CanCast(Unit* pTarget, SpellEntry const* pSpell, bool bTriggered) { - //No target so we can't cast + //No pTarget so we can't cast if (!pTarget || !pSpell) return false; diff --git a/src/bindings/scripts/include/sc_creature.h b/src/bindings/scripts/include/sc_creature.h index 32015dbb340..19d386c7f3e 100644 --- a/src/bindings/scripts/include/sc_creature.h +++ b/src/bindings/scripts/include/sc_creature.h @@ -49,7 +49,7 @@ struct TRINITY_DLL_DECL ScriptedAI : public CreatureAI //CreatureAI Functions //************* - void AttackStartNoMove(Unit *target); + void AttackStartNoMove(Unit *pTarget); // Called at any Damage from any attacker (before damage apply) void DamageTaken(Unit* pDone_by, uint32& uiDamage) {} @@ -73,7 +73,7 @@ struct TRINITY_DLL_DECL ScriptedAI : public CreatureAI void SpellHit(Unit* caster, const SpellEntry *spell) {} // Called when spell hits a target - void SpellHitTarget(Unit* target, const SpellEntry *spell) {} + void SpellHitTarget(Unit *pTarget, const SpellEntry *spell) {} //Called at waypoint reached or PointMovement end void MovementInform(uint32 type, uint32 id){} @@ -153,7 +153,7 @@ struct TRINITY_DLL_DECL ScriptedAI : public CreatureAI Creature* DoSpawnCreature(uint32 uiId, float fX, float fY, float fZ, float fAngle, uint32 uiType, uint32 uiDespawntime); //Selects a unit from the creature's current aggro list - Unit* SelectUnit(SelectAggroTarget target, uint32 uiPosition); + Unit* SelectUnit(SelectAggroTarget pTarget, uint32 uiPosition); bool HealthBelowPct(uint32 pct) const { return me->GetHealth() * 100 < m_creature->GetMaxHealth() * pct; } |