Core: Cleaning up hungarian notation - Phase3: pTarget -> target
This commit is contained in:
+2
-2
@@ -352,8 +352,8 @@ class mob_shadowmoon_channeler : public CreatureScript
|
||||
|
||||
if (MarkOfShadow_Timer <= diff)
|
||||
{
|
||||
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
|
||||
DoCast(pTarget, SPELL_MARK_OF_SHADOW);
|
||||
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
|
||||
DoCast(target, SPELL_MARK_OF_SHADOW);
|
||||
MarkOfShadow_Timer = 15000+rand()%5000;
|
||||
}
|
||||
else
|
||||
|
||||
@@ -122,8 +122,8 @@ class boss_the_maker : public CreatureScript
|
||||
|
||||
if (ExplodingBreaker_Timer <= diff)
|
||||
{
|
||||
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
|
||||
DoCast(pTarget, SPELL_EXPLODING_BREAKER);
|
||||
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
|
||||
DoCast(target, SPELL_EXPLODING_BREAKER);
|
||||
ExplodingBreaker_Timer = 4000+rand()%8000;
|
||||
}
|
||||
else
|
||||
@@ -132,10 +132,10 @@ class boss_the_maker : public CreatureScript
|
||||
/* // Disabled until Core Support for mind control
|
||||
if (domination_timer_timer <= diff)
|
||||
{
|
||||
Unit* pTarget;
|
||||
pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0);
|
||||
Unit* target;
|
||||
target = SelectUnit(SELECT_TARGET_RANDOM, 0);
|
||||
|
||||
DoCast(pTarget, SPELL_DOMINATION);
|
||||
DoCast(target, SPELL_DOMINATION);
|
||||
|
||||
domination_timer = 120000;
|
||||
} else domination_timer -=diff;
|
||||
|
||||
+6
-6
@@ -192,9 +192,9 @@ class boss_omor_the_unscarred : public CreatureScript
|
||||
{
|
||||
DoScriptText(SAY_CURSE, me);
|
||||
|
||||
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
|
||||
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
|
||||
{
|
||||
DoCast(pTarget, SPELL_TREACHEROUS_AURA);
|
||||
DoCast(target, SPELL_TREACHEROUS_AURA);
|
||||
Aura_Timer = 8000+rand()%8000;
|
||||
}
|
||||
}
|
||||
@@ -203,12 +203,12 @@ class boss_omor_the_unscarred : public CreatureScript
|
||||
|
||||
if (Shadowbolt_Timer <= diff)
|
||||
{
|
||||
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
|
||||
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
|
||||
{
|
||||
if (pTarget)
|
||||
pTarget = me->getVictim();
|
||||
if (target)
|
||||
target = me->getVictim();
|
||||
|
||||
DoCast(pTarget, SPELL_SHADOW_BOLT);
|
||||
DoCast(target, SPELL_SHADOW_BOLT);
|
||||
Shadowbolt_Timer = 4000+rand()%2500;
|
||||
}
|
||||
}
|
||||
|
||||
+3
-3
@@ -117,10 +117,10 @@ class boss_nazan : public CreatureScript
|
||||
}
|
||||
}
|
||||
|
||||
void SpellHitTarget(Unit* pTarget, const SpellEntry* entry)
|
||||
void SpellHitTarget(Unit* target, const SpellEntry* entry)
|
||||
{
|
||||
if (pTarget && entry->Id == uint32(SPELL_FIREBALL))
|
||||
me->SummonCreature(ENTRY_LIQUID_FIRE, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), pTarget->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN, 30000);
|
||||
if (target && entry->Id == uint32(SPELL_FIREBALL))
|
||||
me->SummonCreature(ENTRY_LIQUID_FIRE, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), target->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN, 30000);
|
||||
}
|
||||
|
||||
void UpdateAI(const uint32 diff)
|
||||
|
||||
+3
-3
@@ -19,7 +19,7 @@
|
||||
/* ScriptData
|
||||
SDName: Boss_Watchkeeper_Gargolmar
|
||||
SD%Complete: 80
|
||||
SDComment: Missing adds to heal him. Surge should be used on pTarget furthest away, not random.
|
||||
SDComment: Missing adds to heal him. Surge should be used on target furthest away, not random.
|
||||
SDCategory: Hellfire Citadel, Hellfire Ramparts
|
||||
EndScriptData */
|
||||
|
||||
@@ -131,8 +131,8 @@ class boss_watchkeeper_gargolmar : public CreatureScript
|
||||
{
|
||||
DoScriptText(SAY_SURGE, me);
|
||||
|
||||
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
|
||||
DoCast(pTarget, SPELL_SURGE);
|
||||
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
|
||||
DoCast(target, SPELL_SURGE);
|
||||
|
||||
Surge_Timer = 5000+rand()%8000;
|
||||
}
|
||||
|
||||
@@ -426,10 +426,10 @@ class boss_magtheridon : public CreatureScript
|
||||
|
||||
if (Blaze_Timer <= diff)
|
||||
{
|
||||
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
|
||||
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
|
||||
{
|
||||
float x, y, z;
|
||||
pTarget->GetPosition(x, y, z);
|
||||
target->GetPosition(x, y, z);
|
||||
Creature* summon = me->SummonCreature(MOB_ABYSSAL, x, y, z, 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
|
||||
if (summon)
|
||||
{
|
||||
@@ -460,10 +460,10 @@ class boss_magtheridon : public CreatureScript
|
||||
{
|
||||
if (Debris_Timer <= diff)
|
||||
{
|
||||
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
|
||||
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
|
||||
{
|
||||
float x, y, z;
|
||||
pTarget->GetPosition(x, y, z);
|
||||
target->GetPosition(x, y, z);
|
||||
Creature* summon = me->SummonCreature(MOB_ABYSSAL, x, y, z, 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
|
||||
if (summon)
|
||||
CAST_AI(mob_abyssal::mob_abyssalAI, summon->AI())->SetTrigger(1);
|
||||
@@ -577,8 +577,8 @@ class mob_hellfire_channeler : public CreatureScript
|
||||
|
||||
if (Fear_Timer <= diff)
|
||||
{
|
||||
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1))
|
||||
DoCast(pTarget, SPELL_FEAR);
|
||||
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1))
|
||||
DoCast(target, SPELL_FEAR);
|
||||
Fear_Timer = 25000 + rand()%15000;
|
||||
}
|
||||
else
|
||||
@@ -586,8 +586,8 @@ class mob_hellfire_channeler : public CreatureScript
|
||||
|
||||
if (Infernal_Timer <= diff)
|
||||
{
|
||||
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
|
||||
DoCast(pTarget, SPELL_BURNING_ABYSSAL, true);
|
||||
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
|
||||
DoCast(target, SPELL_BURNING_ABYSSAL, true);
|
||||
Infernal_Timer = 30000 + rand()%10000;
|
||||
}
|
||||
else
|
||||
|
||||
@@ -277,8 +277,8 @@ class boss_grand_warlock_nethekurse : public CreatureScript
|
||||
{
|
||||
if (ShadowFissure_Timer <= diff)
|
||||
{
|
||||
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
|
||||
DoCast(pTarget, SPELL_SHADOW_FISSURE);
|
||||
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
|
||||
DoCast(target, SPELL_SHADOW_FISSURE);
|
||||
ShadowFissure_Timer = urand(7500, 15000);
|
||||
}
|
||||
else
|
||||
@@ -286,8 +286,8 @@ class boss_grand_warlock_nethekurse : public CreatureScript
|
||||
|
||||
if (DeathCoil_Timer <= diff)
|
||||
{
|
||||
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
|
||||
DoCast(pTarget, SPELL_DEATH_COIL);
|
||||
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
|
||||
DoCast(target, SPELL_DEATH_COIL);
|
||||
DeathCoil_Timer = urand(15000, 20000);
|
||||
}
|
||||
else
|
||||
|
||||
+2
-2
@@ -383,11 +383,11 @@ class boss_warbringer_omrogg : public CreatureScript
|
||||
|
||||
if (ResetThreat_Timer <= diff)
|
||||
{
|
||||
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
|
||||
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
|
||||
{
|
||||
DoYellForThreat();
|
||||
DoResetThreat();
|
||||
me->AddThreat(pTarget, 0.0f);
|
||||
me->AddThreat(target, 0.0f);
|
||||
}
|
||||
ResetThreat_Timer = 25000+rand()%15000;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user