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

Core: Cleaning up hungarian notation - Phase3: pTarget -> target

Browse Source
This commit is contained in:
click
2011-07-02 23:16:45 +02:00
parent 169f5da8c3
commit 70115f52f7
212 changed files with 1970 additions and 1970 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Outland/GruulsLair/boss_gruul.cpp
+12 -12
View File
@@ -120,18 +120,18 @@ public:
}
}
void SpellHitTarget(Unit* pTarget, const SpellEntry* pSpell)
void SpellHitTarget(Unit* target, const SpellEntry* pSpell)
{
//This to emulate effect1 (77) of SPELL_GROUND_SLAM, knock back to any direction
//It's initially wrong, since this will cause fall damage, which is by comments, not intended.
if (pSpell->Id == SPELL_GROUND_SLAM)
{
if (pTarget->GetTypeId() == TYPEID_PLAYER)
if (target->GetTypeId() == TYPEID_PLAYER)
{
switch (urand(0, 1))
{
case 0: pTarget->CastSpell(pTarget, SPELL_MAGNETIC_PULL, true, NULL, NULL, me->GetGUID()); break;
case 1: pTarget->CastSpell(pTarget, SPELL_KNOCK_BACK, true, NULL, NULL, me->GetGUID()); break;
case 0: target->CastSpell(target, SPELL_MAGNETIC_PULL, true, NULL, NULL, me->GetGUID()); break;
case 1: target->CastSpell(target, SPELL_KNOCK_BACK, true, NULL, NULL, me->GetGUID()); break;
}
}
}
@@ -140,10 +140,10 @@ public:
if (pSpell->Id == SPELL_SHATTER)
{
//this spell must have custom handling in the core, dealing damage based on distance
pTarget->CastSpell(pTarget, SPELL_SHATTER_EFFECT, true);
target->CastSpell(target, SPELL_SHATTER_EFFECT, true);
if (pTarget->HasAura(SPELL_STONED))
pTarget->RemoveAurasDueToSpell(SPELL_STONED);
if (target->HasAura(SPELL_STONED))
target->RemoveAurasDueToSpell(SPELL_STONED);
//clear this, if we are still performing
if (m_bPerformingGroundSlam)
@@ -197,10 +197,10 @@ public:
// Hurtful Strike
if (m_uiHurtfulStrike_Timer <= uiDiff)
{
Unit* pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 1);
Unit* target = SelectTarget(SELECT_TARGET_TOPAGGRO, 1);
if (pTarget && me->IsWithinMeleeRange(me->getVictim()))
DoCast(pTarget, SPELL_HURTFUL_STRIKE);
if (target && me->IsWithinMeleeRange(me->getVictim()))
DoCast(target, SPELL_HURTFUL_STRIKE);
else
DoCast(me->getVictim(), SPELL_HURTFUL_STRIKE);
@@ -221,8 +221,8 @@ public:
// Cave In
if (m_uiCaveIn_Timer <= uiDiff)
{
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, SPELL_CAVE_IN);
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(target, SPELL_CAVE_IN);
if (m_uiCaveIn_StaticTimer >= 4000)
m_uiCaveIn_StaticTimer -= 2000;
src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
+34 -34
View File
@@ -223,11 +223,11 @@ public:
//Only if not incombat check if the event is started
if (!me->isInCombat() && pInstance && pInstance->GetData(DATA_MAULGAREVENT))
{
Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_MAULGAREVENT_TANK));
Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_MAULGAREVENT_TANK));
if (pTarget)
if (target)
{
AttackStart(pTarget);
AttackStart(target);
GetCouncil();
}
}
@@ -280,12 +280,12 @@ public:
//Charging_Timer
if (Charging_Timer <= diff)
{
Unit* pTarget = NULL;
pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
if (pTarget)
Unit* target = NULL;
target = SelectTarget(SELECT_TARGET_RANDOM, 0);
if (target)
{
AttackStart(pTarget);
DoCast(pTarget, SPELL_BERSERKER_C);
AttackStart(target);
DoCast(target, SPELL_BERSERKER_C);
}
Charging_Timer = 20000;
} else Charging_Timer -= diff;
@@ -383,11 +383,11 @@ public:
//Only if not incombat check if the event is started
if (!me->isInCombat() && pInstance && pInstance->GetData(DATA_MAULGAREVENT))
{
Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_MAULGAREVENT_TANK));
Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_MAULGAREVENT_TANK));
if (pTarget)
if (target)
{
AttackStart(pTarget);
AttackStart(target);
}
}
@@ -419,10 +419,10 @@ public:
//DeathCoil Timer /need correct timer
if (DeathCoil_Timer <= diff)
{
Unit* pTarget = NULL;
pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
if (pTarget)
DoCast(pTarget, SPELL_DEATH_COIL);
Unit* target = NULL;
target = SelectTarget(SELECT_TARGET_RANDOM, 0);
if (target)
DoCast(target, SPELL_DEATH_COIL);
DeathCoil_Timer = 20000;
} else DeathCoil_Timer -= diff;
@@ -498,11 +498,11 @@ public:
//Only if not incombat check if the event is started
if (!me->isInCombat() && pInstance && pInstance->GetData(DATA_MAULGAREVENT))
{
Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_MAULGAREVENT_TANK));
Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_MAULGAREVENT_TANK));
if (pTarget)
if (target)
{
AttackStart(pTarget);
AttackStart(target);
}
}
@@ -520,9 +520,9 @@ public:
//GreaterPolymorph_Timer
if (GreaterPolymorph_Timer <= diff)
{
Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
if (pTarget)
DoCast(pTarget, SPELL_GREATER_POLYMORPH);
Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0);
if (target)
DoCast(target, SPELL_GREATER_POLYMORPH);
GreaterPolymorph_Timer = 15000 + rand()%5000;
} else GreaterPolymorph_Timer -= diff;
@@ -618,11 +618,11 @@ public:
//Only if not incombat check if the event is started
if (!me->isInCombat() && pInstance && pInstance->GetData(DATA_MAULGAREVENT))
{
Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_MAULGAREVENT_TANK));
Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_MAULGAREVENT_TANK));
if (pTarget)
if (target)
{
AttackStart(pTarget);
AttackStart(target);
}
}
@@ -728,11 +728,11 @@ public:
//Only if not incombat check if the event is started
if (!me->isInCombat() && pInstance && pInstance->GetData(DATA_MAULGAREVENT))
{
Unit* pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_MAULGAREVENT_TANK));
Unit* target = Unit::GetUnit((*me), pInstance->GetData64(DATA_MAULGAREVENT_TANK));
if (pTarget)
if (target)
{
AttackStart(pTarget);
AttackStart(target);
}
}
@@ -765,22 +765,22 @@ public:
//BlastWave_Timer
if (BlastWave_Timer <= diff)
{
Unit* pTarget = NULL;
Unit* target = NULL;
std::list<HostileReference *> t_list = me->getThreatManager().getThreatList();
std::vector<Unit* > target_list;
for (std::list<HostileReference *>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr)
{
pTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid());
target = Unit::GetUnit(*me, (*itr)->getUnitGuid());
//15 yard radius minimum
if (pTarget && pTarget->IsWithinDist(me, 15, false))
target_list.push_back(pTarget);
pTarget = NULL;
if (target && target->IsWithinDist(me, 15, false))
target_list.push_back(target);
target = NULL;
}
if (!target_list.empty())
pTarget = *(target_list.begin()+rand()%target_list.size());
target = *(target_list.begin()+rand()%target_list.size());
me->InterruptNonMeleeSpells(false);
DoCast(pTarget, SPELL_BLAST_WAVE);
DoCast(target, SPELL_BLAST_WAVE);
BlastWave_Timer = 60000;
} else BlastWave_Timer -= diff;
}