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

Core: Codestyle cleanup

Browse Source
This commit is contained in:
click
2011-06-11 22:35:29 +02:00
parent 9ef8bd3072
commit 158966dc79
410 changed files with 1790 additions and 1790 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp
+3 -3
View File
@@ -63,7 +63,7 @@ public:
Class_Timer = 1000;
}
void EnterCombat(Unit * /*who*/)
void EnterCombat(Unit* /*who*/)
{ }
void SetMyClass(uint8 myclass)
@@ -202,7 +202,7 @@ public:
ScriptedAI::MoveInLineOfSight(who);
}
void EnterCombat(Unit * /*who*/)
void EnterCombat(Unit* /*who*/)
{
DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me);
}
@@ -328,7 +328,7 @@ public:
Mortal_Strike_timer = 10000;
}
void EnterCombat(Unit * /*who*/)
void EnterCombat(Unit* /*who*/)
{
}
src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp
+2 -2
View File
@@ -72,7 +72,7 @@ public:
FocusedTargetGUID = 0;
}
void EnterCombat(Unit * /*who*/)
void EnterCombat(Unit* /*who*/)
{ }
void JustSummoned(Creature *summoned)
@@ -185,7 +185,7 @@ public:
fiery1 = fiery2 = true;
}
void EnterCombat(Unit * /*who*/)
void EnterCombat(Unit* /*who*/)
{ }
void UpdateAI(const uint32 diff)
src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp
+2 -2
View File
@@ -114,7 +114,7 @@ public:
}
}
void EnterCombat(Unit * /*who*/)
void EnterCombat(Unit* /*who*/)
{
DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me);
@@ -253,7 +253,7 @@ public:
Check_Timer = 1000;
}
void EnterCombat(Unit * who)
void EnterCombat(Unit* who)
{
// Send Shaffar to fight
Creature* Shaffar = me->FindNearestCreature(NPC_SHAFFAR, 100);
src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp
+1 -1
View File
@@ -78,7 +78,7 @@ public:
DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2), me);
}
void EnterCombat(Unit * /*who*/)
void EnterCombat(Unit* /*who*/)
{
DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me);
}
src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp
+5 -5
View File
@@ -92,7 +92,7 @@ public:
summon10 = false;
}
void EnterCombat(Unit * /*who*/)
void EnterCombat(Unit* /*who*/)
{
DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me);
}
@@ -220,7 +220,7 @@ public:
flamebuffet_timer = 5000;
}
void EnterCombat(Unit * /*who*/) { }
void EnterCombat(Unit* /*who*/) { }
void UpdateAI(const uint32 diff)
{
@@ -279,7 +279,7 @@ public:
arcanebuffet_timer = 5000;
}
void EnterCombat(Unit * /*who*/) { }
void EnterCombat(Unit* /*who*/) { }
void UpdateAI(const uint32 diff)
{
@@ -333,7 +333,7 @@ public:
frostbuffet_timer = 5000;
}
void EnterCombat(Unit * /*who*/) { }
void EnterCombat(Unit* /*who*/) { }
void UpdateAI(const uint32 diff)
{
@@ -388,7 +388,7 @@ public:
shadowbuffet_timer = 5000;
}
void EnterCombat(Unit * /*who*/) { }
void EnterCombat(Unit* /*who*/) { }
void UpdateAI(const uint32 diff)
{
src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp
+1 -1
View File
@@ -113,7 +113,7 @@ public:
}
}
void EnterCombat(Unit * /*who*/)
void EnterCombat(Unit* /*who*/)
{
DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me);
}
src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp
+3 -3
View File
@@ -126,17 +126,17 @@ public:
}
}
void EnterCombat(Unit * /*who*/)
void EnterCombat(Unit* /*who*/)
{
DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2, SAY_AGGRO3), me);
}
void KilledUnit(Unit * /*victim*/)
void KilledUnit(Unit* /*victim*/)
{
DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me);
}
void JustDied(Unit * /*victim*/)
void JustDied(Unit* /*victim*/)
{
DoScriptText(SAY_DEATH, me);
src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
+3 -3
View File
@@ -91,12 +91,12 @@ public:
pInstance->SetData(DATA_BLACKHEARTTHEINCITEREVENT, NOT_STARTED);
}
void KilledUnit(Unit * /*victim*/)
void KilledUnit(Unit* /*victim*/)
{
DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me);
}
void JustDied(Unit * /*victim*/)
void JustDied(Unit* /*victim*/)
{
DoScriptText(SAY_DEATH, me);
@@ -104,7 +104,7 @@ public:
pInstance->SetData(DATA_BLACKHEARTTHEINCITEREVENT, DONE);
}
void EnterCombat(Unit * /*who*/)
void EnterCombat(Unit* /*who*/)
{
DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2, SAY_AGGRO3), me);
src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp
+4 -4
View File
@@ -89,7 +89,7 @@ public:
sacrificed = false;
}
void EnterCombat(Unit * /*who*/){}
void EnterCombat(Unit* /*who*/){}
void UpdateAI(const uint32 diff)
{
@@ -227,12 +227,12 @@ public:
CAST_AI(mob_voidtraveler::mob_voidtravelerAI, summoned->AI())->VorpilGUID = me->GetGUID();
}
void KilledUnit(Unit * /*victim*/)
void KilledUnit(Unit* /*victim*/)
{
DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me);
}
void JustDied(Unit * /*victim*/)
void JustDied(Unit* /*victim*/)
{
DoScriptText(SAY_DEATH, me);
destroyPortals();
@@ -241,7 +241,7 @@ public:
pInstance->SetData(DATA_GRANDMASTERVORPILEVENT, DONE);
}
void EnterCombat(Unit * /*who*/)
void EnterCombat(Unit* /*who*/)
{
DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2, SAY_AGGRO3), me);
summonPortals();
src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
+1 -1
View File
@@ -95,7 +95,7 @@ public:
}
}
void EnterCombat(Unit * /*who*/) { }
void EnterCombat(Unit* /*who*/) { }
// Sonic Boom instant damage (needs core fix instead of this)
void SpellHitTarget(Unit *pTarget, const SpellEntry *spell)
src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp
+3 -3
View File
@@ -117,7 +117,7 @@ public:
me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_ATTACK_ME, false);
}
void EnterCombat(Unit * /*who*/)
void EnterCombat(Unit* /*who*/)
{
DoZoneInCombat();
DoScriptText(SAY_AGGRO, me);
@@ -125,12 +125,12 @@ public:
pInstance->SetData(DATA_GURTOGGBLOODBOILEVENT, IN_PROGRESS);
}
void KilledUnit(Unit * /*victim*/)
void KilledUnit(Unit* /*victim*/)
{
DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me);
}
void JustDied(Unit * /*victim*/)
void JustDied(Unit* /*victim*/)
{
if (pInstance)
pInstance->SetData(DATA_GURTOGGBLOODBOILEVENT, DONE);
src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
+12 -12
View File
@@ -388,7 +388,7 @@ public:
GlaiveGUID = 0;
}
void EnterCombat(Unit * /*who*/) {DoZoneInCombat();}
void EnterCombat(Unit* /*who*/) {DoZoneInCombat();}
void ChargeCheck()
{
@@ -532,7 +532,7 @@ public:
Timer[EVENT_FLIGHT_SEQUENCE] = 1000;
}
void EnterCombat(Unit * /*who*/)
void EnterCombat(Unit* /*who*/)
{
me->setActive(true);
DoZoneInCombat();
@@ -551,7 +551,7 @@ public:
void MoveInLineOfSight(Unit *) {}
void JustDied(Unit * /*killer*/)
void JustDied(Unit* /*killer*/)
{
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
@@ -564,7 +564,7 @@ public:
pInstance->HandleGameObject(pInstance->GetData64(i), true);
}
void KilledUnit(Unit * victim)
void KilledUnit(Unit* victim)
{
if (victim == me) return;
// TODO: Find better way to handle emote
@@ -589,7 +589,7 @@ public:
done_by->AddThreat(me, -(3*(float)damage)/4); // do not let maiev tank him
}
void SpellHit(Unit * /*caster*/, const SpellEntry *spell)
void SpellHit(Unit* /*caster*/, const SpellEntry *spell)
{
if (spell->Id == SPELL_GLAIVE_RETURNS) // Re-equip our warblades!
{
@@ -1178,8 +1178,8 @@ public:
me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + 2, 45738);
}
void EnterCombat(Unit * /*who*/) {}
void MoveInLineOfSight(Unit * /*who*/) {}
void EnterCombat(Unit* /*who*/) {}
void MoveInLineOfSight(Unit* /*who*/) {}
void EnterEvadeMode() {}
void GetIllidanGUID(uint64 guid) { IllidanGUID = guid; }
@@ -1457,7 +1457,7 @@ public:
me->CombatStop(true);
}
void EnterCombat(Unit * /*who*/) {}
void EnterCombat(Unit* /*who*/) {}
void MoveInLineOfSight(Unit* /*who*/) {}
void MovementInform(uint32 MovementType, uint32 /*Data*/)
@@ -2037,7 +2037,7 @@ public:
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
}
void EnterCombat(Unit * /*who*/){}
void EnterCombat(Unit* /*who*/){}
void MoveInLineOfSight(Unit *who)
{
@@ -2118,7 +2118,7 @@ public:
uint64 TargetGUID;
void EnterCombat(Unit * /*who*/) {DoZoneInCombat();}
void EnterCombat(Unit* /*who*/) {DoZoneInCombat();}
void Reset()
{
@@ -2126,7 +2126,7 @@ public:
DoCast(me, SPELL_SHADOW_DEMON_PASSIVE, true);
}
void JustDied(Unit * /*killer*/)
void JustDied(Unit* /*killer*/)
{
if (Unit *pTarget = Unit::GetUnit((*me), TargetGUID))
pTarget->RemoveAurasDueToSpell(SPELL_PARALYZE);
@@ -2167,7 +2167,7 @@ public:
{
blade_of_azzinothAI(Creature* c) : NullCreatureAI(c) {}
void SpellHit(Unit * /*caster*/, const SpellEntry *spell)
void SpellHit(Unit* /*caster*/, const SpellEntry *spell)
{
if (spell->Id == SPELL_THROW_GLAIVE2 || spell->Id == SPELL_THROW_GLAIVE)
me->SetDisplayId(21431);//appear when hit by Illidan's glaive
src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
+3 -3
View File
@@ -135,7 +135,7 @@ public:
Enraged = false;
}
void EnterCombat(Unit * /*who*/)
void EnterCombat(Unit* /*who*/)
{
if (pInstance)
pInstance->SetData(DATA_MOTHERSHAHRAZEVENT, IN_PROGRESS);
@@ -144,12 +144,12 @@ public:
DoScriptText(SAY_AGGRO, me);
}
void KilledUnit(Unit * /*victim*/)
void KilledUnit(Unit* /*victim*/)
{
DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me);
}
void JustDied(Unit * /*victim*/)
void JustDied(Unit* /*victim*/)
{
if (pInstance)
pInstance->SetData(DATA_MOTHERSHAHRAZEVENT, DONE);
src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
+11 -11
View File
@@ -125,7 +125,7 @@ public:
DoZoneInCombat();
}
void JustDied(Unit * /*killer*/);
void JustDied(Unit* /*killer*/);
};
};
@@ -358,7 +358,7 @@ public:
};
void npc_enslaved_soul::npc_enslaved_soulAI::JustDied(Unit * /*killer*/)
void npc_enslaved_soul::npc_enslaved_soulAI::JustDied(Unit* /*killer*/)
{
if (ReliquaryGUID)
if (Creature *Reliquary = (Unit::GetCreature((*me), ReliquaryGUID)))
@@ -400,7 +400,7 @@ public:
AuraTimer = 5000;
}
void DamageTaken(Unit * /*done_by*/, uint32 &damage)
void DamageTaken(Unit* /*done_by*/, uint32 &damage)
{
if (damage >= me->GetHealth())
{
@@ -411,7 +411,7 @@ public:
}
}
void EnterCombat(Unit * /*who*/)
void EnterCombat(Unit* /*who*/)
{
if (!me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE))
{
@@ -424,7 +424,7 @@ public:
else return;
}
void KilledUnit(Unit * /*victim*/)
void KilledUnit(Unit* /*victim*/)
{
DoScriptText(RAND(SUFF_SAY_SLAY1, SUFF_SAY_SLAY2, SUFF_SAY_SLAY3), me);
}
@@ -536,7 +536,7 @@ public:
}
}
void SpellHit(Unit * /*caster*/, const SpellEntry *spell)
void SpellHit(Unit* /*caster*/, const SpellEntry *spell)
{
if (me->GetCurrentSpell(CURRENT_GENERIC_SPELL))
for (uint8 i = 0; i < 3; ++i)
@@ -546,14 +546,14 @@ public:
me->InterruptSpell(CURRENT_GENERIC_SPELL, false);
}
void EnterCombat(Unit * /*who*/)
void EnterCombat(Unit* /*who*/)
{
DoScriptText(DESI_SAY_FREED, me);
DoZoneInCombat();
DoCast(me, AURA_OF_DESIRE, true);
}
void KilledUnit(Unit * /*victim*/)
void KilledUnit(Unit* /*victim*/)
{
DoScriptText(RAND(DESI_SAY_SLAY1, DESI_SAY_SLAY2, DESI_SAY_SLAY3), me);
}
@@ -632,7 +632,7 @@ public:
CheckedAggro = false;
}
void EnterCombat(Unit * /*who*/)
void EnterCombat(Unit* /*who*/)
{
DoScriptText(RAND(ANGER_SAY_FREED, ANGER_SAY_FREED2), me);
@@ -640,12 +640,12 @@ public:
DoCast(me, AURA_OF_ANGER, true);
}
void JustDied(Unit * /*victim*/)
void JustDied(Unit* /*victim*/)
{
DoScriptText(ANGER_SAY_DEATH, me);
}
void KilledUnit(Unit * /*victim*/)
void KilledUnit(Unit* /*victim*/)
{
DoScriptText(RAND(ANGER_SAY_SLAY1, ANGER_SAY_SLAY2), me);
}
src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
+1 -1
View File
@@ -289,7 +289,7 @@ public:
summons.Despawn(summon);
}
void MoveInLineOfSight(Unit * /*who*/)
void MoveInLineOfSight(Unit* /*who*/)
{
if (!GridSearcherSucceeded)
{
src/server/scripts/Outland/BlackTemple/boss_supremus.cpp
+4 -4
View File
@@ -119,7 +119,7 @@ public:
summons.DespawnAll();
}
void EnterCombat(Unit * /*who*/)
void EnterCombat(Unit* /*who*/)
{
if (pInstance)
pInstance->SetData(DATA_SUPREMUSEVENT, IN_PROGRESS);
@@ -155,7 +155,7 @@ public:
events.ScheduleEvent(EVENT_SWITCH_PHASE, 60000, GCD_CAST);
}
void JustDied(Unit * /*killer*/)
void JustDied(Unit* /*killer*/)
{
if (pInstance)
{
@@ -275,9 +275,9 @@ public:
}
uint32 wait;
void EnterCombat(Unit * /*who*/) {}
void EnterCombat(Unit* /*who*/) {}
void MoveInLineOfSight(Unit * /*who*/) {}
void MoveInLineOfSight(Unit* /*who*/) {}
void DoAction(const int32 /*info*/)
{
src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
+4 -4
View File
@@ -76,7 +76,7 @@ public:
TeronGUID = 0;
}
void EnterCombat(Unit * /*who*/) { }
void EnterCombat(Unit* /*who*/) { }
void AttackStart(Unit* /*who*/) {}
void MoveInLineOfSight(Unit* /*who*/) {}
@@ -263,7 +263,7 @@ public:
Done = false;
}
void EnterCombat(Unit * /*who*/) {}
void EnterCombat(Unit* /*who*/) {}
void MoveInLineOfSight(Unit* pWho)
{
@@ -286,12 +286,12 @@ public:
ScriptedAI::MoveInLineOfSight(pWho);
}
void KilledUnit(Unit * /*victim*/)
void KilledUnit(Unit* /*victim*/)
{
DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me);
}
void JustDied(Unit * /*victim*/)
void JustDied(Unit* /*victim*/)
{
if (pInstance)
pInstance->SetData(DATA_TERONGOREFIENDEVENT, DONE);
src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
+4 -4
View File
@@ -92,13 +92,13 @@ public:
pInstance->SetData(DATA_HIGHWARLORDNAJENTUSEVENT, NOT_STARTED);
}
void KilledUnit(Unit * /*victim*/)
void KilledUnit(Unit* /*victim*/)
{
DoScriptText(rand()%2 ? SAY_SLAY1 : SAY_SLAY2, me);
events.DelayEvents(5000, GCD_YELL);
}
void JustDied(Unit * /*victim*/)
void JustDied(Unit* /*victim*/)
{
if (pInstance)
pInstance->SetData(DATA_HIGHWARLORDNAJENTUSEVENT, DONE);
@@ -106,7 +106,7 @@ public:
DoScriptText(SAY_DEATH, me);
}
void SpellHit(Unit * /*caster*/, const SpellEntry *spell)
void SpellHit(Unit* /*caster*/, const SpellEntry *spell)
{
if (spell->Id == SPELL_HURL_SPINE && me->HasAura(SPELL_TIDAL_SHIELD))
{
@@ -116,7 +116,7 @@ public:
}
}
void EnterCombat(Unit * /*who*/)
void EnterCombat(Unit* /*who*/)
{
if (pInstance)
pInstance->SetData(DATA_HIGHWARLORDNAJENTUSEVENT, IN_PROGRESS);
src/server/scripts/Outland/BlackTemple/illidari_council.cpp
+11 -11
View File
@@ -271,7 +271,7 @@ public:
me->SetDisplayId(11686);
}
void EnterCombat(Unit * /*who*/) {}
void EnterCombat(Unit* /*who*/) {}
void AttackStart(Unit* /*who*/) {}
void MoveInLineOfSight(Unit* /*who*/) {}
@@ -492,12 +492,12 @@ public:
BlessingTimer = 60000;
}
void KilledUnit(Unit * /*victim*/)
void KilledUnit(Unit* /*victim*/)
{
DoScriptText(SAY_GATH_SLAY, me);
}
void JustDied(Unit * /*victim*/)
void JustDied(Unit* /*victim*/)
{
DoScriptText(SAY_GATH_DEATH, me);
}
@@ -621,12 +621,12 @@ public:
Cooldown = 0;
}
void KilledUnit(Unit * /*victim*/)
void KilledUnit(Unit* /*victim*/)
{
DoScriptText(SAY_ZERE_SLAY, me);
}
void JustDied(Unit * /*victim*/)
void JustDied(Unit* /*victim*/)
{
DoScriptText(SAY_ZERE_DEATH, me);
}
@@ -721,12 +721,12 @@ public:
ReflectiveShieldTimer = 0;
}
void KilledUnit(Unit * /*victim*/)
void KilledUnit(Unit* /*victim*/)
{
DoScriptText(SAY_MALA_SLAY, me);
}
void JustDied(Unit * /*victim*/)
void JustDied(Unit* /*victim*/)
{
DoScriptText(SAY_MALA_DEATH, me);
}
@@ -807,12 +807,12 @@ public:
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
}
void KilledUnit(Unit * /*victim*/)
void KilledUnit(Unit* /*victim*/)
{
DoScriptText(SAY_VERA_SLAY, me);
}
void JustDied(Unit * /*victim*/)
void JustDied(Unit* /*victim*/)
{
DoScriptText(SAY_VERA_DEATH, me);
}
@@ -891,14 +891,14 @@ public:
{
PrepareAuraScript(spell_boss_lady_malande_shield_AuraScript);
bool Validate(SpellEntry const * /*spellEntry*/)
bool Validate(SpellEntry const* /*spellEntry*/)
{
return sSpellStore.LookupEntry(SPELL_REFLECTIVE_SHIELD_T);
}
void Trigger(AuraEffect * aurEff, DamageInfo & dmgInfo, uint32 & absorbAmount)
{
Unit * target = GetTarget();
Unit* target = GetTarget();
if (dmgInfo.GetAttacker() == target)
return;
int32 bp = absorbAmount / 2;
src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
+9 -9
View File
@@ -199,12 +199,12 @@ public:
pInstance->SetData(DATA_KARATHRESSEVENT, IN_PROGRESS);
}
void KilledUnit(Unit * /*victim*/)
void KilledUnit(Unit* /*victim*/)
{
DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me);
}
void JustDied(Unit * /*killer*/)
void JustDied(Unit* /*killer*/)
{
DoScriptText(SAY_DEATH, me);
@@ -215,7 +215,7 @@ public:
me->SummonCreature(SEER_OLUM, OLUM_X, OLUM_Y, OLUM_Z, OLUM_O, TEMPSUMMON_TIMED_DESPAWN, 3600000);
}
void EnterCombat(Unit * who)
void EnterCombat(Unit* who)
{
StartEvent(who);
}
@@ -354,7 +354,7 @@ public:
pInstance->SetData(DATA_KARATHRESSEVENT, NOT_STARTED);
}
void JustDied(Unit * /*victim*/)
void JustDied(Unit* /*victim*/)
{
if (pInstance)
{
@@ -367,7 +367,7 @@ public:
}
}
void EnterCombat(Unit * who)
void EnterCombat(Unit* who)
{
if (pInstance)
{
@@ -494,7 +494,7 @@ public:
pInstance->SetData(DATA_KARATHRESSEVENT, NOT_STARTED);
}
void JustDied(Unit * /*victim*/)
void JustDied(Unit* /*victim*/)
{
if (pInstance)
{
@@ -507,7 +507,7 @@ public:
}
}
void EnterCombat(Unit * who)
void EnterCombat(Unit* who)
{
if (pInstance)
{
@@ -621,7 +621,7 @@ public:
pInstance->SetData(DATA_KARATHRESSEVENT, NOT_STARTED);
}
void JustDied(Unit * /*victim*/)
void JustDied(Unit* /*victim*/)
{
if (pInstance)
{
@@ -634,7 +634,7 @@ public:
}
}
void EnterCombat(Unit * who)
void EnterCombat(Unit* who)
{
if (pInstance)
{
src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
+3 -3
View File
@@ -166,7 +166,7 @@ public:
}
}
}
void EnterCombat(Unit * /*who*/)
void EnterCombat(Unit* /*who*/)
{
DoScriptText(SAY_AGGRO, me);
@@ -174,7 +174,7 @@ public:
pInstance->SetData(DATA_HYDROSSTHEUNSTABLEEVENT, IN_PROGRESS);
}
void KilledUnit(Unit * /*victim*/)
void KilledUnit(Unit* /*victim*/)
{
if (CorruptedForm)
{
@@ -207,7 +207,7 @@ public:
Summons.Despawn(summon);
}
void JustDied(Unit * /*victim*/)
void JustDied(Unit* /*victim*/)
{
if (CorruptedForm)
DoScriptText(SAY_CORRUPT_DEATH, me);
src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
+11 -11
View File
@@ -226,12 +226,12 @@ public:
if (TaintedElemental_Timer > 50000)
TaintedElemental_Timer = 50000;
}
void KilledUnit(Unit * /*victim*/)
void KilledUnit(Unit* /*victim*/)
{
DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me);
}
void JustDied(Unit * /*victim*/)
void JustDied(Unit* /*victim*/)
{
DoScriptText(SAY_DEATH, me);
@@ -249,7 +249,7 @@ public:
pInstance->SetData(DATA_LADYVASHJEVENT, IN_PROGRESS);
}
void EnterCombat(Unit * who)
void EnterCombat(Unit* who)
{
if (pInstance)
{
@@ -630,9 +630,9 @@ public:
VashjGUID = pInstance->GetData64(DATA_LADYVASHJ);
}
void EnterCombat(Unit * /*who*/) {}
void EnterCombat(Unit* /*who*/) {}
void MoveInLineOfSight(Unit * /*who*/) {}
void MoveInLineOfSight(Unit* /*who*/) {}
void UpdateAI(const uint32 diff)
{
@@ -705,7 +705,7 @@ public:
Despawn_Timer = 30000;
}
void JustDied(Unit * /*killer*/)
void JustDied(Unit* /*killer*/)
{
if (pInstance)
{
@@ -717,7 +717,7 @@ public:
}
}
void EnterCombat(Unit * who)
void EnterCombat(Unit* who)
{
me->AddThreat(who, 0.1f);
}
@@ -787,12 +787,12 @@ public:
Check_Timer = 1000;
}
void EnterCombat(Unit * /*who*/)
void EnterCombat(Unit* /*who*/)
{
}
void MoveInLineOfSight(Unit * /*who*/)
void MoveInLineOfSight(Unit* /*who*/)
{
}
@@ -939,9 +939,9 @@ public:
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
}
void EnterCombat(Unit * /*who*/) {}
void EnterCombat(Unit* /*who*/) {}
void MoveInLineOfSight(Unit * /*who*/) {}
void MoveInLineOfSight(Unit* /*who*/) {}
void UpdateAI (const uint32 diff)
{
src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
+11 -11
View File
@@ -94,7 +94,7 @@ public:
ShadowBolt_Timer = 10000;
Link_Timer = 1000;
}
void JustDied(Unit * /*victim*/)
void JustDied(Unit* /*victim*/)
{
Unit* pUnit = Unit::GetUnit((*me), victimGUID);
if (pUnit && pUnit->HasAura(SPELL_INSIDIOUS_WHISPER))
@@ -110,7 +110,7 @@ public:
}
}
void EnterCombat(Unit * /*who*/)
void EnterCombat(Unit* /*who*/)
{
if (!victimGUID) return;
}
@@ -367,7 +367,7 @@ public:
}
}
void KilledUnit(Unit * victim)
void KilledUnit(Unit* victim)
{
if (victim->GetTypeId() != TYPEID_PLAYER)
return;
@@ -382,7 +382,7 @@ public:
}
}
void JustDied(Unit * /*victim*/)
void JustDied(Unit* /*victim*/)
{
DoScriptText(SAY_DEATH, me);
@@ -396,7 +396,7 @@ public:
pInstance->SetData(DATA_LEOTHERASTHEBLINDEVENT, DONE);
}
void EnterCombat(Unit * /*who*/)
void EnterCombat(Unit* /*who*/)
{
if (me->HasAura(AURA_BANISH))
return;
@@ -520,7 +520,7 @@ public:
{
if ((*itr) && (*itr)->isAlive())
{
Creature * demon = me->SummonCreature(INNER_DEMON_ID, (*itr)->GetPositionX()+10, (*itr)->GetPositionY()+10, (*itr)->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
Creature* demon = me->SummonCreature(INNER_DEMON_ID, (*itr)->GetPositionX()+10, (*itr)->GetPositionY()+10, (*itr)->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
if (demon)
{
demon->AI()->AttackStart((*itr));
@@ -616,7 +616,7 @@ public:
DoScriptText(SAY_FREE, me);
}
void KilledUnit(Unit * victim)
void KilledUnit(Unit* victim)
{
if (victim->GetTypeId() != TYPEID_PLAYER)
return;
@@ -624,13 +624,13 @@ public:
DoScriptText(RAND(SAY_DEMON_SLAY1, SAY_DEMON_SLAY2, SAY_DEMON_SLAY3), me);
}
void JustDied(Unit * /*victim*/)
void JustDied(Unit* /*victim*/)
{
//invisibility (blizzlike, at the end of the fight he doesn't die, he disappears)
DoCast(me, 8149, true);
}
void EnterCombat(Unit * /*who*/)
void EnterCombat(Unit* /*who*/)
{
StartEvent();
}
@@ -703,7 +703,7 @@ public:
}
}
void EnterCombat(Unit * who)
void EnterCombat(Unit* who)
{
me->InterruptNonMeleeSpells(false);
if (pInstance)
@@ -792,7 +792,7 @@ public:
DoMeleeAttackIfReady();
}
void JustDied(Unit * /*killer*/) {}
void JustDied(Unit* /*killer*/) {}
};
};
src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
+2 -2
View File
@@ -157,7 +157,7 @@ public:
Summons.DespawnAll();
}
void EnterCombat(Unit * who)
void EnterCombat(Unit* who)
{
if (pInstance)
pInstance->SetData(DATA_THELURKERBELOWEVENT, IN_PROGRESS);
@@ -425,7 +425,7 @@ public:
}
void EnterCombat(Unit * /*who*/)
void EnterCombat(Unit* /*who*/)
{
}
src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
+4 -4
View File
@@ -135,12 +135,12 @@ public:
pInstance->SetData(DATA_MOROGRIMTIDEWALKEREVENT, IN_PROGRESS);
}
void KilledUnit(Unit * /*victim*/)
void KilledUnit(Unit* /*victim*/)
{
DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me);
}
void JustDied(Unit * /*victim*/)
void JustDied(Unit* /*victim*/)
{
DoScriptText(SAY_DEATH, me);
@@ -148,7 +148,7 @@ public:
pInstance->SetData(DATA_MOROGRIMTIDEWALKEREVENT, DONE);
}
void EnterCombat(Unit * /*who*/)
void EnterCombat(Unit* /*who*/)
{
PlayerList = &me->GetMap()->GetPlayers();
Playercount = PlayerList->getSize();
@@ -309,7 +309,7 @@ public:
me->setFaction(14);
}
void EnterCombat(Unit * /*who*/) {}
void EnterCombat(Unit* /*who*/) {}
void MoveInLineOfSight(Unit *who)
{
src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp
+2 -2
View File
@@ -92,7 +92,7 @@ public:
DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me);
}
void EnterCombat(Unit * /*who*/)
void EnterCombat(Unit* /*who*/)
{
DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me);
@@ -167,7 +167,7 @@ public:
WaterBoltVolley_Timer = 3000+rand()%3000;
}
void EnterCombat(Unit * /*who*/) { }
void EnterCombat(Unit* /*who*/) { }
void UpdateAI(const uint32 diff)
{
src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp
+2 -2
View File
@@ -101,7 +101,7 @@ public:
DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me);
}
void EnterCombat(Unit * /*who*/)
void EnterCombat(Unit* /*who*/)
{
DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me);
@@ -223,7 +223,7 @@ public:
//react only if attacked
}
void EnterCombat(Unit * /*who*/) { }
void EnterCombat(Unit* /*who*/) { }
void UpdateAI(const uint32 diff)
{
src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp
+5 -5
View File
@@ -77,9 +77,9 @@ public:
}
}
void EnterCombat(Unit * /*who*/) { }
void EnterCombat(Unit* /*who*/) { }
void StartRageGen(Unit * /*caster*/)
void StartRageGen(Unit* /*caster*/)
{
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
@@ -90,7 +90,7 @@ public:
pInstance->SetData(TYPE_DISTILLER, IN_PROGRESS);
}
void DamageTaken(Unit * /*done_by*/, uint32 &damage)
void DamageTaken(Unit* /*done_by*/, uint32 &damage)
{
if (me->GetHealth() <= damage)
if (pInstance)
@@ -135,7 +135,7 @@ public:
pInstance->SetData(TYPE_WARLORD_KALITHRESH, NOT_STARTED);
}
void EnterCombat(Unit * /*who*/)
void EnterCombat(Unit* /*who*/)
{
DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2, SAY_AGGRO3), me);
@@ -148,7 +148,7 @@ public:
DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me);
}
void SpellHit(Unit * /*caster*/, const SpellEntry *spell)
void SpellHit(Unit* /*caster*/, const SpellEntry *spell)
{
//hack :(
if (spell->Id == SPELL_WARLORDS_RAGE_PROC)
src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp
+2 -2
View File
@@ -55,7 +55,7 @@ public:
AcidGeyser_Timer = 10000;
}
void EnterCombat(Unit * /*who*/)
void EnterCombat(Unit* /*who*/)
{
}
@@ -128,7 +128,7 @@ public:
DoCast(me, SPELL_SPORE_CLOUD, true);
}
void MoveInLineOfSight(Unit * /*who*/) {}
void MoveInLineOfSight(Unit* /*who*/) {}
void AttackStart(Unit* /*who*/) {}
src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp
+2 -2
View File
@@ -73,7 +73,7 @@ public:
Striders.clear();
}
void EnterCombat(Unit * /*who*/) {}
void EnterCombat(Unit* /*who*/) {}
void JustSummoned(Creature *summon)
{
@@ -88,7 +88,7 @@ public:
}
}
void JustDied(Unit * /*who*/)
void JustDied(Unit* /*who*/)
{
for (std::list<uint64>::const_iterator i = Striders.begin(); i != Striders.end(); ++i)
if (Creature *strider = Unit::GetCreature(*me, *i))
src/server/scripts/Outland/GruulsLair/boss_gruul.cpp
+1 -1
View File
@@ -96,7 +96,7 @@ public:
pInstance->SetData(DATA_GRUULEVENT, NOT_STARTED);
}
void EnterCombat(Unit * /*who*/)
void EnterCombat(Unit* /*who*/)
{
DoScriptText(SAY_AGGRO, me);
src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
+2 -2
View File
@@ -589,7 +589,7 @@ public:
pInstance->SetData(DATA_MAULGAREVENT, NOT_STARTED);
}
void EnterCombat(Unit * who)
void EnterCombat(Unit* who)
{
if (pInstance)
{
@@ -699,7 +699,7 @@ public:
pInstance->SetData(DATA_MAULGAREVENT, NOT_STARTED);
}
void EnterCombat(Unit * who)
void EnterCombat(Unit* who)
{
if (pInstance)
{
src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
+1 -1
View File
@@ -71,7 +71,7 @@ class boss_broggok : public CreatureScript
}
}
void EnterCombat(Unit * /*who*/)
void EnterCombat(Unit* /*who*/)
{
DoScriptText(SAY_AGGRO, me);
if (pInstance)
src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp
+1 -1
View File
@@ -78,7 +78,7 @@ class boss_the_maker : public CreatureScript
pInstance->HandleGameObject(pInstance->GetData64(DATA_DOOR2), true);
}
void EnterCombat(Unit * /*who*/)
void EnterCombat(Unit* /*who*/)
{
DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me);
src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
+1 -1
View File
@@ -90,7 +90,7 @@ class boss_omor_the_unscarred : public CreatureScript
CanPullBack = false;
}
void EnterCombat(Unit * /*who*/)
void EnterCombat(Unit* /*who*/)
{
DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me);
}
src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
+1 -1
View File
@@ -225,7 +225,7 @@ class boss_vazruden : public CreatureScript
WipeSaid = false;
}
void EnterCombat(Unit * /*who*/)
void EnterCombat(Unit* /*who*/)
{
DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me);
}
src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
+1 -1
View File
@@ -78,7 +78,7 @@ class boss_watchkeeper_gargolmar : public CreatureScript
YelledForHeal = false;
}
void EnterCombat(Unit * /*who*/)
void EnterCombat(Unit* /*who*/)
{
DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me);
}
src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
+3 -3
View File
@@ -352,7 +352,7 @@ class boss_magtheridon : public CreatureScript
ScriptedAI::AttackStart(who);
}
void EnterCombat(Unit * /*who*/)
void EnterCombat(Unit* /*who*/)
{
if (pInstance)
pInstance->SetData(DATA_MAGTHERIDON_EVENT, IN_PROGRESS);
@@ -519,7 +519,7 @@ class mob_hellfire_channeler : public CreatureScript
Check_Timer = 5000;
}
void EnterCombat(Unit * /*who*/)
void EnterCombat(Unit* /*who*/)
{
if (pInstance)
pInstance->SetData(DATA_CHANNELER_EVENT, IN_PROGRESS);
@@ -611,7 +611,7 @@ public:
{
}
bool OnGossipHello(Player *pPlayer, GameObject * pGO)
bool OnGossipHello(Player *pPlayer, GameObject* pGO)
{
InstanceScript* pInstance = pGO->GetInstanceScript();
src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
+3 -3
View File
@@ -203,7 +203,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript
ScriptedAI::MoveInLineOfSight(who);
}
void EnterCombat(Unit * /*who*/)
void EnterCombat(Unit* /*who*/)
{
DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me);
}
@@ -332,7 +332,7 @@ class mob_fel_orc_convert : public CreatureScript
Hemorrhage_Timer = 3000;
}
void MoveInLineOfSight(Unit * /*who*/)
void MoveInLineOfSight(Unit* /*who*/)
{
}
@@ -404,7 +404,7 @@ class mob_lesser_shadow_fissure : public CreatureScript
mob_lesser_shadow_fissureAI(Creature* pCreature) : ScriptedAI(pCreature) {}
void Reset() { }
void MoveInLineOfSight(Unit * /*who*/) {}
void MoveInLineOfSight(Unit* /*who*/) {}
void AttackStart(Unit* /*who*/) {}
void EnterCombat(Unit* /*who*/) {}
};
src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
+1 -1
View File
@@ -237,7 +237,7 @@ class boss_warbringer_omrogg : public CreatureScript
ThreatYell = true;
}
void EnterCombat(Unit * /*who*/)
void EnterCombat(Unit* /*who*/)
{
me->SummonCreature(NPC_LEFT_HEAD, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0);
me->SummonCreature(NPC_RIGHT_HEAD, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0);
src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
+1 -1
View File
@@ -108,7 +108,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript
resetcheck_timer = 5000;
}
void EnterCombat(Unit * /*who*/)
void EnterCombat(Unit* /*who*/)
{
DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2, SAY_AGGRO3), me);
}
src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
+5 -5
View File
@@ -135,7 +135,7 @@ class boss_alar : public CreatureScript
me->setActive(false);
}
void EnterCombat(Unit * /*who*/)
void EnterCombat(Unit* /*who*/)
{
if (pInstance)
pInstance->SetData(DATA_ALAREVENT, IN_PROGRESS);
@@ -145,7 +145,7 @@ class boss_alar : public CreatureScript
me->setActive(true);
}
void JustDied(Unit * /*victim*/)
void JustDied(Unit* /*victim*/)
{
if (pInstance)
pInstance->SetData(DATA_ALAREVENT, DONE);
@@ -158,7 +158,7 @@ class boss_alar : public CreatureScript
summon->AI()->AttackStart(pTarget);
}
void MoveInLineOfSight(Unit * /*who*/) {}
void MoveInLineOfSight(Unit* /*who*/) {}
void AttackStart(Unit* who)
{
@@ -481,7 +481,7 @@ class mob_ember_of_alar : public CreatureScript
{
toDie = false;
}
void EnterCombat(Unit * /*who*/)
void EnterCombat(Unit* /*who*/)
{
DoZoneInCombat();
}
@@ -548,7 +548,7 @@ class mob_flame_patch_alar : public CreatureScript
{
mob_flame_patch_alarAI(Creature* pCreature) : ScriptedAI(pCreature) {}
void Reset() {}
void EnterCombat(Unit * /*who*/) {}
void EnterCombat(Unit* /*who*/) {}
void AttackStart(Unit* /*who*/) {}
void MoveInLineOfSight(Unit* /*who*/) {}
void UpdateAI(const uint32 /*diff*/) {}
src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
+4 -4
View File
@@ -143,12 +143,12 @@ class boss_high_astromancer_solarian : public CreatureScript
Summons.DespawnAll();
}
void KilledUnit(Unit * /*victim*/)
void KilledUnit(Unit* /*victim*/)
{
DoScriptText(RAND(SAY_KILL1, SAY_KILL2, SAY_KILL3), me);
}
void JustDied(Unit * /*victim*/)
void JustDied(Unit* /*victim*/)
{
me->SetFloatValue(OBJECT_FIELD_SCALE_X, defaultsize);
me->SetDisplayId(MODEL_HUMAN);
@@ -157,7 +157,7 @@ class boss_high_astromancer_solarian : public CreatureScript
pInstance->SetData(DATA_HIGHASTROMANCERSOLARIANEVENT, DONE);
}
void EnterCombat(Unit * /*who*/)
void EnterCombat(Unit* /*who*/)
{
DoScriptText(SAY_AGGRO, me);
DoZoneInCombat();
@@ -435,7 +435,7 @@ class mob_solarium_priest : public CreatureScript
aoesilenceTimer = 15000;
}
void EnterCombat(Unit * /*who*/)
void EnterCombat(Unit* /*who*/)
{
}
src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
+3 -3
View File
@@ -423,7 +423,7 @@ class boss_kaelthas : public CreatureScript
}
}
void EnterCombat(Unit * /*who*/)
void EnterCombat(Unit* /*who*/)
{
if (m_pInstance && !m_pInstance->GetData(DATA_KAELTHASEVENT) && !Phase)
StartEvent();
@@ -1425,9 +1425,9 @@ class mob_kael_flamestrike : public CreatureScript
me->setFaction(14);
}
void MoveInLineOfSight(Unit * /*who*/) {}
void MoveInLineOfSight(Unit* /*who*/) {}
void EnterCombat(Unit * /*who*/) {}
void EnterCombat(Unit* /*who*/) {}
void UpdateAI(const uint32 diff)
{
src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
+3 -3
View File
@@ -80,12 +80,12 @@ class boss_void_reaver : public CreatureScript
pInstance->SetData(DATA_VOIDREAVEREVENT, NOT_STARTED);
}
void KilledUnit(Unit * /*victim*/)
void KilledUnit(Unit* /*victim*/)
{
DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me);
}
void JustDied(Unit * /*victim*/)
void JustDied(Unit* /*victim*/)
{
DoScriptText(SAY_DEATH, me);
DoZoneInCombat();
@@ -94,7 +94,7 @@ class boss_void_reaver : public CreatureScript
pInstance->SetData(DATA_VOIDREAVEREVENT, DONE);
}
void EnterCombat(Unit * /*who*/)
void EnterCombat(Unit* /*who*/)
{
DoScriptText(SAY_AGGRO, me);
src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp
+1 -1
View File
@@ -57,7 +57,7 @@ class mob_crystalcore_devastator : public CreatureScript
Knockaway_Timer = 25000;
}
void EnterCombat(Unit * /*who*/)
void EnterCombat(Unit* /*who*/)
{
}
src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
+1 -1
View File
@@ -73,7 +73,7 @@ class boss_gatewatcher_iron_hand : public CreatureScript
Stream_of_Machine_Fluid_Timer = 55000;
}
void EnterCombat(Unit * /*who*/)
void EnterCombat(Unit* /*who*/)
{
DoScriptText(SAY_AGGRO_1, me);
}
src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
+1 -1
View File
@@ -93,7 +93,7 @@ class boss_pathaleon_the_calculator : public CreatureScript
Counter = 0;
summons.DespawnAll();
}
void EnterCombat(Unit * /*who*/)
void EnterCombat(Unit* /*who*/)
{
DoScriptText(SAY_AGGRO, me);
}
src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
+4 -4
View File
@@ -122,14 +122,14 @@ class npc_millhouse_manastorm : public CreatureScript
}
}
void EnterCombat(Unit * /*who*/){}
void EnterCombat(Unit* /*who*/){}
void KilledUnit(Unit * /*victim*/)
void KilledUnit(Unit* /*victim*/)
{
DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2), me);
}
void JustDied(Unit * /*victim*/)
void JustDied(Unit* /*victim*/)
{
DoScriptText(SAY_DEATH, me);
@@ -328,7 +328,7 @@ class npc_warden_mellichar : public CreatureScript
}
}
void EnterCombat(Unit * /*who*/)
void EnterCombat(Unit* /*who*/)
{
DoScriptText(YELL_INTRO1, me);
DoCast(me, SPELL_BUBBLE_VISUAL);
src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
+2 -2
View File
@@ -110,7 +110,7 @@ class boss_harbinger_skyriss : public CreatureScript
ScriptedAI::MoveInLineOfSight(who);
}
void EnterCombat(Unit * /*who*/) {}
void EnterCombat(Unit* /*who*/) {}
void JustDied(Unit* /*Killer*/)
{
@@ -294,7 +294,7 @@ class boss_harbinger_skyriss_illusion : public CreatureScript
void Reset() { }
void EnterCombat(Unit * /*who*/) { }
void EnterCombat(Unit* /*who*/) { }
};
CreatureAI* GetAI(Creature* creature) const
src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp
+1 -1
View File
@@ -80,7 +80,7 @@ class boss_high_botanist_freywinn : public CreatureScript
MoveFree = true;
}
void EnterCombat(Unit * /*who*/)
void EnterCombat(Unit* /*who*/)
{
DoScriptText(SAY_AGGRO, me);
}
src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp
+1 -1
View File
@@ -155,7 +155,7 @@ class boss_laj : public CreatureScript
CanSummon = false;
}
void EnterCombat(Unit * /*who*/)
void EnterCombat(Unit* /*who*/)
{
}
src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
+2 -2
View File
@@ -86,7 +86,7 @@ class mob_warp_splinter_treant : public CreatureScript
check_Timer = 0;
}
void EnterCombat(Unit * /*who*/) {}
void EnterCombat(Unit* /*who*/) {}
void MoveInLineOfSight(Unit* /*who*/) {}
@@ -159,7 +159,7 @@ class boss_warp_splinter : public CreatureScript
me->SetSpeed(MOVE_RUN, 0.7f, true);
}
void EnterCombat(Unit * /*who*/)
void EnterCombat(Unit* /*who*/)
{
DoScriptText(SAY_AGGRO, me);
}
src/server/scripts/Outland/nagrand.cpp
+4 -4
View File
@@ -200,7 +200,7 @@ public:
}
}
void EnterCombat(Unit * /*who*/)
void EnterCombat(Unit* /*who*/)
{
if (me->HasAura(SPELL_VISUAL_SLEEP))
me->RemoveAura(SPELL_VISUAL_SLEEP);
@@ -267,9 +267,9 @@ public:
me->SetStandState(UNIT_STAND_STATE_DEAD);
}
void EnterCombat(Unit * /*who*/) {}
void EnterCombat(Unit* /*who*/) {}
void SpellHit(Unit * /*caster*/, const SpellEntry *spell)
void SpellHit(Unit* /*caster*/, const SpellEntry *spell)
{
if (spell->Id == 32146)
{
@@ -301,7 +301,7 @@ class npc_altruis_the_sufferer : public CreatureScript
public:
npc_altruis_the_sufferer() : CreatureScript("npc_altruis_the_sufferer") { }
bool OnQuestAccept(Player* pPlayer, Creature* /*pCreature*/, Quest const * /*quest*/)
bool OnQuestAccept(Player* pPlayer, Creature* /*pCreature*/, Quest const* /*quest*/)
{
if (!pPlayer->GetQuestRewardStatus(9991)) //Survey the Land, q-id 9991
{
src/server/scripts/Outland/netherstorm.cpp
+4 -4
View File
@@ -98,7 +98,7 @@ public:
add = NULL;
}
void EnterCombat(Unit * /*who*/) {}
void EnterCombat(Unit* /*who*/) {}
/*void SpellHit(Unit *caster, const SpellEntry *spell)
{
@@ -421,7 +421,7 @@ public:
isEvent = false;
}
void EnterCombat(Unit * /*who*/) { }
void EnterCombat(Unit* /*who*/) { }
void JustSummoned(Creature *summoned)
{
@@ -776,13 +776,13 @@ public:
me->UpdateEntry(NPC_PHASE_HUNTER_ENTRY);
}
void EnterCombat(Unit * who)
void EnterCombat(Unit* who)
{
if (who->GetTypeId() == TYPEID_PLAYER)
PlayerGUID = who->GetGUID();
}
void SpellHit(Unit * /*caster*/, const SpellEntry * /*spell*/)
void SpellHit(Unit* /*caster*/, const SpellEntry * /*spell*/)
{
DoCast(me, SPELL_DE_MATERIALIZE);
}
src/server/scripts/Outland/shadowmoon_valley.cpp
+2 -2
View File
@@ -1495,7 +1495,7 @@ public:
}
void EnterCombat(Unit* /*who*/) {}
void JustDied(Unit * /*slayer*/)
void JustDied(Unit* /*slayer*/)
{
me->RemoveCorpse();
if (Creature* LordIllidan = (Unit::GetCreature(*me, LordIllidanGUID)))
@@ -1739,7 +1739,7 @@ public:
void Reset() { }
void EnterCombat(Unit * /*who*/){}
void EnterCombat(Unit* /*who*/){}
void JustDied(Unit* /*killer*/)
{
src/server/scripts/Outland/terokkar_forest.cpp
+6 -6
View File
@@ -77,7 +77,7 @@ public:
me->setFaction(FACTION_HOSTILE);
}
void EnterCombat(Unit * /*who*/) {}
void EnterCombat(Unit* /*who*/) {}
void DoNice()
{
@@ -172,7 +172,7 @@ public:
mob_infested_root_walkerAI(Creature *c) : ScriptedAI(c) {}
void Reset() { }
void EnterCombat(Unit * /*who*/) { }
void EnterCombat(Unit* /*who*/) { }
void DamageTaken(Unit *done_by, uint32 &damage)
{
@@ -267,7 +267,7 @@ public:
mob_rotting_forest_ragerAI(Creature *c) : ScriptedAI(c) {}
void Reset() { }
void EnterCombat(Unit * /*who*/) { }
void EnterCombat(Unit* /*who*/) { }
void DamageTaken(Unit *done_by, uint32 &damage)
{
@@ -307,8 +307,8 @@ public:
mob_netherweb_victimAI(Creature *c) : ScriptedAI(c) {}
void Reset() { }
void EnterCombat(Unit * /*who*/) { }
void MoveInLineOfSight(Unit * /*who*/) { }
void EnterCombat(Unit* /*who*/) { }
void MoveInLineOfSight(Unit* /*who*/) { }
void JustDied(Unit* Killer)
{
@@ -411,7 +411,7 @@ public:
me->setFaction(m_uiNormFaction);
}
void EnterCombat(Unit * /*who*/) {}
void EnterCombat(Unit* /*who*/) {}
void UpdateAI(const uint32 diff)
{
src/server/scripts/Outland/zangarmarsh.cpp
+1 -1
View File
@@ -164,7 +164,7 @@ public:
me->setFaction(m_uiNormFaction);
}
void EnterCombat(Unit * /*who*/) {}
void EnterCombat(Unit* /*who*/) {}
void UpdateAI(const uint32 diff)
{