diff options
| author | click <clickvd@gonnamakeyou.com> | 2011-06-11 22:35:29 +0200 |
|---|---|---|
| committer | click <clickvd@gonnamakeyou.com> | 2011-06-11 22:35:29 +0200 |
| commit | 158966dc793f47dd4ada264da775f647601298aa (patch) | |
| tree | 8fa1dc1cc36d07123662c32eb5981cfac01e91b6 /src/server/scripts | |
| parent | 9ef8bd307200445f448a67d1bb26c3afee9b7051 (diff) | |
Core: Codestyle cleanup
Diffstat (limited to 'src/server/scripts')
324 files changed, 797 insertions, 797 deletions
diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp index a1961ae6c63..29033627ee0 100644 --- a/src/server/scripts/Commands/cs_debug.cpp +++ b/src/server/scripts/Commands/cs_debug.cpp @@ -732,7 +732,7 @@ public: handler->PSendSysMessage("Hostil reference list of %s (guid %u)", target->GetName(), target->GetGUIDLow()); while (ref) { - if (Unit * unit = ref->getSource()->getOwner()) + if (Unit* unit = ref->getSource()->getOwner()) { ++cnt; handler->PSendSysMessage(" %u. %s (guid %u) - threat %f", cnt, unit->GetName(), unit->GetGUIDLow(), ref->getThreat()); diff --git a/src/server/scripts/Commands/cs_go.cpp b/src/server/scripts/Commands/cs_go.cpp index fc46ffec497..7129aa67c99 100644 --- a/src/server/scripts/Commands/cs_go.cpp +++ b/src/server/scripts/Commands/cs_go.cpp @@ -143,7 +143,7 @@ public: uint32 id = fields[6].GetUInt32(); // if creature is in same map with caster go at its current location - if (Creature * creature = sObjectAccessor->GetCreature(*_player, MAKE_NEW_GUID(guid, id, HIGHGUID_UNIT))) + if (Creature* creature = sObjectAccessor->GetCreature(*_player, MAKE_NEW_GUID(guid, id, HIGHGUID_UNIT))) { x = creature->GetPositionX(); y = creature->GetPositionY(); diff --git a/src/server/scripts/Commands/cs_gobject.cpp b/src/server/scripts/Commands/cs_gobject.cpp index 726b937cf95..44d87729719 100644 --- a/src/server/scripts/Commands/cs_gobject.cpp +++ b/src/server/scripts/Commands/cs_gobject.cpp @@ -556,7 +556,7 @@ public: float z = fields[4].GetFloat(); uint16 mapid = fields[5].GetUInt16(); - GameObjectTemplate const * gInfo = sObjectMgr->GetGameObjectTemplate(entry); + GameObjectTemplate const* gInfo = sObjectMgr->GetGameObjectTemplate(entry); if (!gInfo) continue; diff --git a/src/server/scripts/Commands/cs_tele.cpp b/src/server/scripts/Commands/cs_tele.cpp index eac6d29651b..af8debd8844 100644 --- a/src/server/scripts/Commands/cs_tele.cpp +++ b/src/server/scripts/Commands/cs_tele.cpp @@ -208,7 +208,7 @@ public: return false; } - MapEntry const * map = sMapStore.LookupEntry(tele->mapId); + MapEntry const* map = sMapStore.LookupEntry(tele->mapId); if (!map || map->IsBattlegroundOrArena()) { handler->SendSysMessage(LANG_CANNOT_TELE_TO_BG); @@ -289,7 +289,7 @@ public: return false; } - MapEntry const * map = sMapStore.LookupEntry(tele->mapId); + MapEntry const* map = sMapStore.LookupEntry(tele->mapId); if (!map || map->IsBattlegroundOrArena()) { handler->SendSysMessage(LANG_CANNOT_TELE_TO_BG); diff --git a/src/server/scripts/Commands/cs_titles.cpp b/src/server/scripts/Commands/cs_titles.cpp index b96b656e7d8..fc268afe75a 100644 --- a/src/server/scripts/Commands/cs_titles.cpp +++ b/src/server/scripts/Commands/cs_titles.cpp @@ -69,7 +69,7 @@ public: return false; } - Player * target = handler->getSelectedPlayer(); + Player* target = handler->getSelectedPlayer(); if (!target) { handler->SendSysMessage(LANG_NO_CHAR_SELECTED); @@ -114,7 +114,7 @@ public: return false; } - Player * target = handler->getSelectedPlayer(); + Player* target = handler->getSelectedPlayer(); if (!target) { handler->SendSysMessage(LANG_NO_CHAR_SELECTED); @@ -161,7 +161,7 @@ public: return false; } - Player * target = handler->getSelectedPlayer(); + Player* target = handler->getSelectedPlayer(); if (!target) { handler->SendSysMessage(LANG_NO_CHAR_SELECTED); diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp index c3518115f54..fc3c469771a 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp @@ -120,7 +120,7 @@ public: Summons.DespawnAll(); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(YELL_AGGRO, me); } diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp index 2639d2ab5c6..2e162dde5b8 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp @@ -67,7 +67,7 @@ public: uiYellTimer = urand(20*IN_MILLISECONDS, 30*IN_MILLISECONDS); //20 to 30 seconds } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(YELL_AGGRO, me); } diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp index 7014bfde7c4..e25df98863b 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp @@ -58,7 +58,7 @@ public: uiResetTimer = 5*IN_MILLISECONDS; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(YELL_AGGRO, me); } diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp index a04cb1b55b5..dbaf7a77fa0 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp @@ -63,7 +63,7 @@ public: uiYellTimer = urand(20*IN_MILLISECONDS, 30*IN_MILLISECONDS); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(YELL_AGGRO, me); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp index 1e8e5e74750..238e72474b7 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp @@ -53,7 +53,7 @@ public: Spirit_Timer = 24000; } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void SummonSpirits(Unit* victim) { diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp index 450a22d3799..db6e2547381 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp @@ -63,7 +63,7 @@ public: EnvelopingWeb_Timer = 16000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp index 2b90ddbcd11..7a662d8e99b 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp @@ -62,7 +62,7 @@ public: //Counter= 0; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); me->CallForHelp(VISIBLE_RANGE); diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp index e067cd90221..33f72025dfc 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp @@ -61,7 +61,7 @@ public: Medics = false; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp index e8c3ca21352..414748bccca 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp @@ -54,7 +54,7 @@ public: MortalStrike_Timer = 22000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp index 56e4d503dbf..9303475328b 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp @@ -54,7 +54,7 @@ public: Frenzy_Timer =0; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp index 79562c59d96..1403c0e44d9 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp @@ -60,7 +60,7 @@ public: ShadowShield_Timer = 8000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp index 22500b9c17e..0ff398193d1 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp @@ -59,7 +59,7 @@ public: WarStomp_Timer =0; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp index 1ad7b532706..4247a7d3ea4 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp @@ -62,7 +62,7 @@ public: Smite_Timer = 8000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp index 149b5ffc192..684002acfd3 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp @@ -184,7 +184,7 @@ public: } } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } @@ -201,7 +201,7 @@ public: pInstance->SetData64(DATA_EVENSTARTER, 0); } - void JustDied(Unit * /*who*/) + void JustDied(Unit* /*who*/) { if (pInstance) pInstance->SetData(DATA_GHOSTKILL, 1); diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gyth.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gyth.cpp index 244f2b21f74..b08478a1145 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gyth.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gyth.cpp @@ -87,8 +87,8 @@ public: void SummonCreatureWithRandomTarget(uint32 creatureId, uint8 count) { for (uint8 n = 0; n < count; n++) - if (Unit * Summoned = me->SummonCreature(creatureId, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 240*IN_MILLISECONDS)) - if (Unit * target = SelectTarget(SELECT_TARGET_RANDOM, 0, 50.0f, true)) + if (Unit* Summoned = me->SummonCreature(creatureId, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 240*IN_MILLISECONDS)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 50.0f, true)) Summoned->AddThreat(target, 250.0f); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp index 6133379822f..be6aa718a98 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp @@ -54,7 +54,7 @@ public: //DoCast(me, SPELL_ICEARMOR, true); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { _EnterCombat(); events.ScheduleEvent(EVENT_CURSE_OF_BLOOD, 2*IN_MILLISECONDS); diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_warmaster_voone.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_warmaster_voone.cpp index bb49385f373..b1ae9b07630 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_warmaster_voone.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_warmaster_voone.cpp @@ -59,7 +59,7 @@ public: _Reset(); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { _EnterCombat(); events.ScheduleEvent(EVENT_SNAP_KICK, 8*IN_MILLISECONDS); diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp index 14870a81289..fd870eb0f2f 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp @@ -60,7 +60,7 @@ public: KnockBack_Timer = 30000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); DoZoneInCombat(); diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp index 2202982e595..766c74563cf 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp @@ -197,7 +197,7 @@ public: Enraged = false; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp index 73bea5bbc3c..019db29a508 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp @@ -57,7 +57,7 @@ public: Heal_Timer = 1000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoZoneInCombat(); } diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp index 8ae3b52d289..7a300e9a368 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp @@ -54,7 +54,7 @@ public: FlameBuffet_Timer = 5000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoZoneInCombat(); } diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp index 25e5306dae5..848e95f6e1c 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp @@ -56,7 +56,7 @@ public: Frenzy_Timer = 10000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoZoneInCombat(); } diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp index 0c975bdd171..e92483ff734 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp @@ -110,7 +110,7 @@ public: DoScriptText(SAY_DEATH, me); } - void EnterCombat(Unit * who) + void EnterCombat(Unit* who) { DoScriptText(RAND(SAY_XHEALTH, SAY_AGGRO, SAY_SHADOWFLAME), me); diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp index f97f081594e..424d8b723dc 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp @@ -64,7 +64,7 @@ public: Conflagration_Timer = 12000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoZoneInCombat(); } diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp index c502828ab36..dd10305638f 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp @@ -130,7 +130,7 @@ public: me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); } - void KilledUnit(Unit * victim) + void KilledUnit(Unit* victim) { if (rand()%5) return; @@ -138,7 +138,7 @@ public: DoScriptText(SAY_KILLTARGET, me, victim); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoCast(me, SPELL_ESSENCEOFTHERED); DoZoneInCombat(); diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp index a2165dbbd92..57a34de3804 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp @@ -243,7 +243,7 @@ public: AttackStart(pTarget); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp index 94155f51f11..858374a8399 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp @@ -75,17 +75,17 @@ public: me->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_ARCANE, true); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_KILL1, SAY_KILL2), me); } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { DoScriptText(SAY_DEATH, me); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); } diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp index 84dcf2d40b8..d06e68ddf37 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp @@ -83,7 +83,7 @@ public: DoScriptText(SAY_DEATH, me); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); } diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp index ba6908fd2e9..1ccb913d8ba 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp @@ -84,12 +84,12 @@ public: void EnterCombat(Unit* /*who*/) {} - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_KILL1, SAY_KILL2), me); } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { DoScriptText(SAY_DEATH, me); if (Unit *pMidnight = Unit::GetUnit(*me, Midnight)) @@ -98,7 +98,7 @@ public: void UpdateAI(const uint32 diff); - void SpellHit(Unit * /*source*/, const SpellEntry *spell) + void SpellHit(Unit* /*source*/, const SpellEntry *spell) { if (spell->Mechanic == MECHANIC_DISARM) DoScriptText(SAY_DISARMED, me); @@ -137,7 +137,7 @@ public: void EnterCombat(Unit* /*who*/) {} - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { if (Phase == 2) { diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp index 8a96f761798..1e17b720220 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp @@ -251,7 +251,7 @@ public: Door->SetGoState(open ? GO_STATE_ACTIVE : GO_STATE_READY); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { HandleDoors(false); SwitchToPortalPhase(); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp index 4c954c2dd51..6beaf3a906b 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp @@ -154,7 +154,7 @@ public: } } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { if (pInstance) pInstance->SetData(TYPE_NIGHTBANE, IN_PROGRESS); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp index c016b232939..f0c38af0ab6 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp @@ -117,8 +117,8 @@ public: InfernalPoint *point; void Reset() {} - void EnterCombat(Unit * /*who*/) {} - void MoveInLineOfSight(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { @@ -149,7 +149,7 @@ public: CAST_CRE(pMalchezaar)->AI()->KilledUnit(who); } - void SpellHit(Unit * /*who*/, const SpellEntry *spell) + void SpellHit(Unit* /*who*/, const SpellEntry *spell) { if (spell->Id == SPELL_INFERNAL_RELAY) { @@ -238,12 +238,12 @@ public: pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_NETHER_DOOR), true); } - 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); @@ -259,7 +259,7 @@ public: pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_NETHER_DOOR), true); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp index 6218b72bcdf..d30494333a2 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp @@ -157,12 +157,12 @@ public: } } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_KILL1, SAY_KILL2), me); } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { DoScriptText(SAY_DEATH, me); @@ -173,7 +173,7 @@ public: } } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2, SAY_AGGRO3), me); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp index 9c60fafb5a3..e11f85c02ca 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp @@ -85,7 +85,7 @@ public: AmplifyTimer = 2000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { if (!pInstance) { @@ -153,7 +153,7 @@ public: void AttackStart(Unit* /*who*/) {} void MoveInLineOfSight(Unit* /*who*/) {} - void JustDied(Unit * /*killer*/) + void JustDied(Unit* /*killer*/) { if (SacrificeGUID) { @@ -226,7 +226,7 @@ public: me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FIRE, true); } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { @@ -339,12 +339,12 @@ public: } } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); } - void JustDied(Unit * /*killer*/) + void JustDied(Unit* /*killer*/) { for (uint8 i = 0; i < 2; ++i) { diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp index 9d0c540223d..253878eefe7 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp @@ -147,7 +147,7 @@ public: } } - void JustDied(Unit * /*killer*/) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_DEATH, me); @@ -164,7 +164,7 @@ public: RemoveGravityLapse(); // Remove Gravity Lapse so that players fall to ground if they kill him when in air. } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { if (!pInstance) return; @@ -457,8 +457,8 @@ public: DoCast(me, SPELL_FLAMESTRIKE2, true); } - void EnterCombat(Unit * /*who*/) {} - void MoveInLineOfSight(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { if (FlameStrikeTimer <= diff) diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp index cd7eb6e9015..0bf0b8f0129 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp @@ -96,18 +96,18 @@ public: pInstance->SetData(DATA_VEXALLUS_EVENT, NOT_STARTED); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(SAY_KILL, me); } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { if (pInstance) pInstance->SetData(DATA_VEXALLUS_EVENT, DONE); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); @@ -219,9 +219,9 @@ public: } } - void EnterCombat(Unit * /*who*/) {} - void MoveInLineOfSight(Unit * /*who*/) {} - void AttackStart(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} + void AttackStart(Unit* /*who*/) {} }; }; diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp index a205b3e5ad8..a1f6e47c755 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp @@ -321,7 +321,7 @@ class mob_son_of_flame : public CreatureScript instance = me->GetInstanceScript(); } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { if (instance) instance->SetData(DATA_RAGNAROS_ADDS, 1); diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp index 0477b41dacd..889b487a330 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp @@ -130,7 +130,7 @@ public: me->LoadEquipment(0, true); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { events.ScheduleEvent(EVENT_ICY_TOUCH, 1000, GCD_CAST); events.ScheduleEvent(EVENT_PLAGUE_STRIKE, 3000, GCD_CAST); @@ -694,7 +694,7 @@ public: { npc_ros_dark_riderAI(Creature *c) : ScriptedAI(c) {} - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { me->ExitVehicle(); } @@ -902,7 +902,7 @@ public: } } - void PassengerBoarded(Unit * /*who*/, int8 /*seatId*/, bool apply) + void PassengerBoarded(Unit* /*who*/, int8 /*seatId*/, bool apply) { if (!apply) if (Creature *miner = Unit::GetCreature(*me, minerGUID)) diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp index f30d0be1f74..3f22aee29cd 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp @@ -375,7 +375,7 @@ public: uiStage_timer = 3000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_TREE2, me); me->Unmount(); diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp index fb98668f3f7..d5965aa2dbf 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp @@ -1680,7 +1680,7 @@ public: { npc_the_lich_king_tirion_dawnAI(Creature* pCreature) : ScriptedAI(pCreature) { Reset(); } void Reset() {} - void AttackStart(Unit * /*who*/) {} // very sample, just don't make them aggreesive + void AttackStart(Unit* /*who*/) {} // very sample, just don't make them aggreesive void UpdateAI(const uint32 /*diff*/) {} void JustDied(Unit* /*killer*/) {} }; diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp index 6b0ddf80096..3aba9f3ffca 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp @@ -66,7 +66,7 @@ public: bShielded = false; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); } diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp index 53f6693a60d..d0dcc4c9d83 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp @@ -54,7 +54,7 @@ public: Terrify_Timer = 20000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp index 8fe766409e4..f5a8479faa3 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp @@ -66,7 +66,7 @@ public: FireNova_Timer = 40000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); } diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp index 3b5c3a064d4..dd877a2d257 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp @@ -157,7 +157,7 @@ public: uint32 spell; uint32 spell2; void Reset(){} - void EnterCombat(Unit * /*who*/){} + void EnterCombat(Unit* /*who*/){} void SetType(uint32 _type) { switch(Creaturetype = _type) @@ -248,7 +248,7 @@ public: laugh = urand(15000, 30000); } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void SaySound(int32 textEntry, Unit *pTarget = 0) { DoScriptText(textEntry, me, pTarget); @@ -478,7 +478,7 @@ public: ++id; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { if (pInstance) pInstance->SetData(DATA_HORSEMAN_EVENT, IN_PROGRESS); @@ -780,9 +780,9 @@ public: me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED); } - 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 == SPELL_SPROUTING) { @@ -804,7 +804,7 @@ public: debuffGUID = 0; } - void JustDied(Unit * /*killer*/) { if (!sprouted) Despawn(); } + void JustDied(Unit* /*killer*/) { if (!sprouted) Despawn(); } void MoveInLineOfSight(Unit *who) { diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp index a97377f9d01..3ec4d9c91fa 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp @@ -66,13 +66,13 @@ public: Whirlwind_Timer = 60000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); DoCast(me, SPELL_RUSHINGCHARGE); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(SAY_KILL, me); } diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp index be37b82e8b0..664521dd7a2 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp @@ -68,7 +68,7 @@ public: PowerWordShield = false; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp index 2392927b488..4aa6b74681a 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp @@ -53,7 +53,7 @@ public: BloodLust_Timer = 20000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); } diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp index eb7ffbc111a..6168b5d8939 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp @@ -65,7 +65,7 @@ public: ShadowWordPain_Timer = 5000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); } diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp index 86f5a0037f7..de190f9d260 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp @@ -57,7 +57,7 @@ public: FrostNova_Timer = 30000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp index eff0adccffb..a303761e500 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp @@ -82,11 +82,11 @@ public: Teleport_Timer = 16000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } - void JustDied(Unit * /*killer*/) + void JustDied(Unit* /*killer*/) { if (pInstance) pInstance->SetData(TYPE_GANDLING, DONE); diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp index 7b03c22a9ca..ea07e6d5da9 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp @@ -43,13 +43,13 @@ public: { } - void DamageTaken(Unit * /*done_by*/, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) { if (me->GetHealth() <= damage) DoCast(me, 23261, true); //Summon Darkreaver's Fallen Charger } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } }; diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp index 9009cdcd1c2..80e35195bd2 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp @@ -58,7 +58,7 @@ public: Fear_Timer = 30000; } - void JustDied(Unit * /*killer*/) + void JustDied(Unit* /*killer*/) { InstanceScript *pInstance = me->GetInstanceScript(); if (pInstance) @@ -70,7 +70,7 @@ public: } } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp index 467c4f1cd18..74d6c994464 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp @@ -65,7 +65,7 @@ public: TouchCounter = 0; } - void JustDied(Unit * /*killer*/) + void JustDied(Unit* /*killer*/) { InstanceScript *pInstance = me->GetInstanceScript(); if (pInstance) @@ -77,7 +77,7 @@ public: } } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp index 39f491d779f..f75042b5d8e 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp @@ -59,7 +59,7 @@ public: Invisible = false; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } @@ -175,7 +175,7 @@ public: me->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_MAGIC, true); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp index b104a0a9b4c..25a2b9ed10d 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp @@ -57,7 +57,7 @@ public: Mages = false; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp index e5bf50b6162..269364bca1a 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp @@ -54,7 +54,7 @@ public: me->LoadCreaturesAddon(); } - void JustDied(Unit * /*killer*/) + void JustDied(Unit* /*killer*/) { InstanceScript *pInstance = me->GetInstanceScript(); if (pInstance) @@ -66,7 +66,7 @@ public: } } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp index e2231cdff80..149b51ab397 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp @@ -58,7 +58,7 @@ public: NoxiousCatalyst_Timer = 35000; } - void JustDied(Unit * /*killer*/) + void JustDied(Unit* /*killer*/) { InstanceScript *pInstance = me->GetInstanceScript(); if (pInstance) @@ -70,7 +70,7 @@ public: } } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp index f29f9d3f2d8..8444a426ebc 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp @@ -65,7 +65,7 @@ public: DoCast(me, SPELL_ICEARMOR, true); } - void EnterCombat(Unit * /*who*/){} + void EnterCombat(Unit* /*who*/){} void UpdateAI(const uint32 diff) { diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp index 0c81be88038..19a3183c91d 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp @@ -60,7 +60,7 @@ public: HasYelled = false; } - void JustDied(Unit * /*killer*/) + void JustDied(Unit* /*killer*/) { InstanceScript *pInstance = me->GetInstanceScript(); if (pInstance) @@ -72,7 +72,7 @@ public: } } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp index 1dd9ecea38c..d27990be43b 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp @@ -63,7 +63,7 @@ public: //Possess_Timer = 35000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp index 3c24fd48010..e86521225ba 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp @@ -114,7 +114,7 @@ public: me->SummonCreature(11054, ADD_9X, ADD_9Y, ADD_9Z, ADD_9O, TEMPSUMMON_TIMED_DESPAWN, 240000); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp index 424602d3d5a..5f8a91c65a6 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp @@ -115,7 +115,7 @@ public: TEMPSUMMON_TIMED_DESPAWN, HOUR*IN_MILLISECONDS); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp index d2eac9f2efd..dada1176cf0 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp @@ -80,7 +80,7 @@ public: me->SetDisplayId(MODEL_HUMAN); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp index 1b14261e212..ac4ad7f63a7 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp @@ -61,7 +61,7 @@ public: DrainLife_Timer = 31000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp index 36b2cfc07a6..6413a953bd2 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp @@ -63,7 +63,7 @@ public: RaiseUndeadScarab_Timer = 3000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp index c2e392f92a4..04a9e4690aa 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp @@ -67,7 +67,7 @@ public: HasYelled = false; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp index 714c3b81ee8..54cdcf2ae04 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp @@ -59,7 +59,7 @@ public: Knockout_Timer = 12000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp index faf35185559..129d9ead38e 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp @@ -52,7 +52,7 @@ public: HasYelled = false; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { if (!HasYelled) { diff --git a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp index c71394227f0..d8b33bbae93 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp @@ -224,7 +224,7 @@ public: void EnterCombat(Unit* /*who*/) {} - void SpellHit(Unit * /*caster*/, const SpellEntry *spell) + void SpellHit(Unit* /*caster*/, const SpellEntry *spell) { if (!Tagged && spell->Id == SPELL_EGAN_BLASTER) Tagged = true; diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp index 950d5f2731d..b0c6c42876d 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp @@ -119,7 +119,7 @@ public: pInstance->SetData(DATA_BRUTALLUS_EVENT, NOT_STARTED); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(YELL_AGGRO, me); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp index 5604f1d4a39..2f03d57af91 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp @@ -146,7 +146,7 @@ public: pInstance->SetData(DATA_EREDAR_TWINS_EVENT, NOT_STARTED); } - void EnterCombat(Unit * who) + void EnterCombat(Unit* who) { DoZoneInCombat(); @@ -161,7 +161,7 @@ public: pInstance->SetData(DATA_EREDAR_TWINS_EVENT, IN_PROGRESS); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { if (rand()%4 == 0) DoScriptText(RAND(YELL_SAC_KILL_1, YELL_SAC_KILL_2), me); @@ -409,7 +409,7 @@ public: pInstance->SetData(DATA_EREDAR_TWINS_EVENT, NOT_STARTED); } - void EnterCombat(Unit * who) + void EnterCombat(Unit* who) { DoZoneInCombat(); @@ -455,7 +455,7 @@ public: } } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { if (rand()%4 == 0) { @@ -699,7 +699,7 @@ public: KillTimer = 15000; } - void EnterCombat(Unit * /*who*/){} + void EnterCombat(Unit* /*who*/){} void SpellHitTarget(Unit *pTarget, const SpellEntry* spell) { diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp index efcb1e1b29e..3d8673d712c 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp @@ -159,7 +159,7 @@ public: pInstance->SetData(DATA_FELMYST_EVENT, NOT_STARTED); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { events.ScheduleEvent(EVENT_BERSERK, 600000); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp index cc7ede77917..bdce8d1dd15 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp @@ -358,7 +358,7 @@ public: pInstance->SetData(DATA_KALECGOS_EVENT, IN_PROGRESS); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_EVIL_SLAY1, SAY_EVIL_SLAY2), me); } @@ -661,7 +661,7 @@ public: DoScriptText(RAND(SAY_SATH_SLAY1, SAY_SATH_SLAY2), me); } - void JustDied(Unit * /*killer*/) + void JustDied(Unit* /*killer*/) { DoScriptText(SAY_SATH_DEATH, me); me->GetMap()->CreatureRelocation(me, me->GetPositionX(), me->GetPositionY(), DRAGON_REALM_Z, me->GetOrientation()); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp index 721659611de..a9fbc693bd5 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp @@ -1078,7 +1078,7 @@ public: bLockedTarget = false; } - void DamageTaken(Unit * /*done_by*/, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) { if (damage > me->GetHealth()) DoCast(me, SPELL_FELFIRE_FISSION, true); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp index 015f7b9e40c..83ea67c33e3 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp @@ -134,7 +134,7 @@ public: pInstance->SetData(DATA_MURU_EVENT, NOT_STARTED); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoCastAOE(SPELL_NEGATIVE_ENERGY_E, true); DoCast(me, SPELL_ENTROPIUS_SPAWN, false); @@ -246,7 +246,7 @@ public: pInstance->SetData(DATA_MURU_EVENT, NOT_STARTED); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoCastAOE(SPELL_NEGATIVE_ENERGY, false); @@ -254,7 +254,7 @@ public: pInstance->SetData(DATA_MURU_EVENT, IN_PROGRESS); } - void DamageTaken(Unit * /*done_by*/, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) { if (damage > me->GetHealth() && Phase == 1) { diff --git a/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp b/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp index 01730f8142a..ae3db51890a 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp @@ -105,7 +105,7 @@ class boss_archaedas : public CreatureScript } } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { me->setFaction(14); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -124,7 +124,7 @@ class boss_archaedas : public CreatureScript } } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { me->MonsterYell(SAY_KILL, LANG_UNIVERSAL, 0); DoPlaySoundToSet(me, SOUND_KILL); @@ -196,7 +196,7 @@ class boss_archaedas : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied (Unit * /*pKiller*/) + void JustDied (Unit* /*pKiller*/) { if (pInstance) { @@ -258,7 +258,7 @@ class mob_archaedas_minions : public CreatureScript me->RemoveAllAuras(); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { me->setFaction (14); me->RemoveAllAuras(); @@ -346,7 +346,7 @@ class mob_stonekeepers : public CreatureScript me->RemoveAllAuras(); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { me->setFaction(14); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -362,7 +362,7 @@ class mob_stonekeepers : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit * /*attacker*/) + void JustDied(Unit* /*attacker*/) { DoCast (me, SPELL_SELF_DESTRUCT, true); if (pInstance) diff --git a/src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp b/src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp index 5ccfb7b8b19..f3cc42fcf47 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp @@ -55,7 +55,7 @@ class boss_ironaya : public CreatureScript bHasCastedWstomp = false; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); } diff --git a/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp index 29dbe1c56e5..efb14fc8c49 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp @@ -62,7 +62,7 @@ class mob_jadespine_basilisk : public CreatureScript uiCslumberTimer = 2000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp index 043243a7d8f..bdca5ad1fa3 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp @@ -126,7 +126,7 @@ class boss_akilzon : public CreatureScript SetWeather(WEATHER_STATE_FINE, 0.0f); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { me->MonsterYell(SAY_ONAGGRO, LANG_UNIVERSAL, 0); DoPlaySoundToSet(me, SOUND_ONAGGRO); @@ -417,7 +417,7 @@ class mob_akilzon_eagle : public CreatureScript me->SetUnitMovementFlags(MOVEMENTFLAG_LEVITATING); } - void EnterCombat(Unit * /*who*/) {DoZoneInCombat();} + void EnterCombat(Unit* /*who*/) {DoZoneInCombat();} void MoveInLineOfSight(Unit* /*who*/) {} diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp index 109a3f14760..f38ffe564b5 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp @@ -123,7 +123,7 @@ class boss_halazzi : public CreatureScript EnterPhase(PHASE_LYNX); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { if (pInstance) pInstance->SetData(DATA_HALAZZIEVENT, IN_PROGRESS); @@ -141,7 +141,7 @@ class boss_halazzi : public CreatureScript LynxGUID = summon->GetGUID(); } - void DamageTaken(Unit * /*done_by*/, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) { if (damage >= me->GetHealth() && Phase != PHASE_ENRAGE) damage = 0; @@ -368,7 +368,7 @@ class mob_halazzi_lynx : public CreatureScript shredder_timer = 4000; } - void DamageTaken(Unit * /*done_by*/, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) { if (damage >= me->GetHealth()) damage = 0; @@ -380,7 +380,7 @@ class mob_halazzi_lynx : public CreatureScript ScriptedAI::AttackStart(who); } - void EnterCombat(Unit * /*who*/) {/*DoZoneInCombat();*/} + void EnterCombat(Unit* /*who*/) {/*DoZoneInCombat();*/} void UpdateAI(const uint32 diff) { diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp index c4ab983677a..bfe833cbed8 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp @@ -172,7 +172,7 @@ class boss_janalai : public CreatureScript DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { if (pInstance) pInstance->SetData(DATA_JANALAIEVENT, IN_PROGRESS); @@ -454,7 +454,7 @@ class mob_janalai_firebomb : public CreatureScript void Reset() {} - void SpellHit(Unit * /*caster*/, const SpellEntry *spell) + void SpellHit(Unit* /*caster*/, const SpellEntry *spell) { if (spell->Id == SPELL_FIRE_BOMB_THROW) DoCast(me, SPELL_FIRE_BOMB_DUMMY, true); @@ -638,7 +638,7 @@ class mob_janalai_hatchling : public CreatureScript me->SetUnitMovementFlags(MOVEMENTFLAG_LEVITATING); } - void EnterCombat(Unit * /*who*/) {/*DoZoneInCombat();*/} + void EnterCombat(Unit* /*who*/) {/*DoZoneInCombat();*/} void UpdateAI(const uint32 diff) { diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp index 76a2d09df75..69e051f52f6 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp @@ -267,7 +267,7 @@ class boss_nalorakk : public CreatureScript } } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { if (pInstance) pInstance->SetData(DATA_NALORAKKEVENT, IN_PROGRESS); diff --git a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp index 26bb7bb631c..c301447fa61 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp @@ -58,7 +58,7 @@ class npc_forest_frog : public CreatureScript void Reset() {} - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void DoSpawnRandom() { @@ -132,7 +132,7 @@ class npc_zulaman_hostage : public CreatureScript bool IsLoot; uint64 PlayerGUID; void Reset() {} - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void JustDied(Unit* /*who*/) { Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID); diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp index 3070a0a2fd7..2eac011f8c9 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp @@ -52,7 +52,7 @@ class boss_gahzranka : public CreatureScript Slam_Timer = 17000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp index 06ea67db8c1..0fb323982f1 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp @@ -51,7 +51,7 @@ class boss_grilek : public CreatureScript GroundTremor_Timer = 8000 + rand()%8000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp index 70d4d160ca0..f1f65e4408d 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp @@ -105,7 +105,7 @@ class boss_hakkar : public CreatureScript Enraged = false; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp index eef2c3cce01..db8182113ce 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp @@ -53,7 +53,7 @@ class boss_hazzarah : public CreatureScript Illusions_Timer = 10000 + rand()%8000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp index c9cfffd690d..706fc14327e 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp @@ -88,7 +88,7 @@ class boss_jeklik : public CreatureScript PhaseTwo = false; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); DoCast(me, SPELL_BAT_FORM); @@ -254,7 +254,7 @@ class mob_batrider : public CreatureScript me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void UpdateAI (const uint32 diff) { diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp index 4096f982095..c9ac816ecea 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp @@ -69,7 +69,7 @@ class boss_jindo : public CreatureScript Teleport_Timer = 5000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); } @@ -201,7 +201,7 @@ class mob_healing_ward : public CreatureScript Heal_Timer = 2000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } @@ -251,7 +251,7 @@ class mob_shade_of_jindo : public CreatureScript DoCast(me, SPELL_INVISIBLE, true); } - void EnterCombat(Unit * /*who*/){} + void EnterCombat(Unit* /*who*/){} void UpdateAI (const uint32 diff) { diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp index 5c8ba750bda..60db1387276 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp @@ -134,7 +134,7 @@ class boss_mandokir : public CreatureScript } } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); } @@ -307,7 +307,7 @@ class mob_ohgan : public CreatureScript SunderArmor_Timer = 5000; } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void JustDied(Unit* /*Killer*/) { diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp index ad6950c8f30..fa6fe02f5a0 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp @@ -83,7 +83,7 @@ class boss_marli : public CreatureScript PhaseTwo = false; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); } @@ -239,7 +239,7 @@ class mob_spawn_of_marli : public CreatureScript LevelUp_Timer = 3000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp index b5550e6e740..d534c1788eb 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp @@ -65,7 +65,7 @@ class boss_renataki : public CreatureScript Ambushed = false; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp index 796124be1dd..efdd095681e 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp @@ -103,7 +103,7 @@ class boss_thekal : public CreatureScript WasDead = false; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); } @@ -309,7 +309,7 @@ class mob_zealot_lorkhan : public CreatureScript me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } @@ -471,7 +471,7 @@ class mob_zealot_zath : public CreatureScript me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp index a623c8e3760..9973dcd8724 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp @@ -84,7 +84,7 @@ class boss_venoxis : public CreatureScript InBerserk= false; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp index e6e38b761ee..9ea2dbdcf91 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp @@ -51,7 +51,7 @@ class boss_wushoolay : public CreatureScript LightningWave_Timer = 8000 + rand()%8000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/boss_kruul.cpp b/src/server/scripts/EasternKingdoms/boss_kruul.cpp index 5c1a1d77b0d..d1c2220c262 100644 --- a/src/server/scripts/EasternKingdoms/boss_kruul.cpp +++ b/src/server/scripts/EasternKingdoms/boss_kruul.cpp @@ -66,7 +66,7 @@ public: Hound_Timer = 8000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/burning_steppes.cpp b/src/server/scripts/EasternKingdoms/burning_steppes.cpp index 4d2abdea18c..42435714261 100644 --- a/src/server/scripts/EasternKingdoms/burning_steppes.cpp +++ b/src/server/scripts/EasternKingdoms/burning_steppes.cpp @@ -145,7 +145,7 @@ public: ScriptedAI::MoveInLineOfSight(who); } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} }; }; diff --git a/src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp b/src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp index 2d9f6ab9cc0..0457c58b2f7 100644 --- a/src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp +++ b/src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp @@ -128,7 +128,7 @@ public: me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} }; diff --git a/src/server/scripts/EasternKingdoms/eversong_woods.cpp b/src/server/scripts/EasternKingdoms/eversong_woods.cpp index c4bd0e022a4..d720b37f056 100644 --- a/src/server/scripts/EasternKingdoms/eversong_woods.cpp +++ b/src/server/scripts/EasternKingdoms/eversong_woods.cpp @@ -247,7 +247,7 @@ public: } } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { @@ -396,7 +396,7 @@ public: paladinGuid[i] = 0; } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { diff --git a/src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp b/src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp index 4b29e2d71f9..6c598cb85b6 100644 --- a/src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp +++ b/src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp @@ -62,7 +62,7 @@ public: Timer = 2500; } - void MoveInLineOfSight(Unit * /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} void EnterCombat(Unit* /*who*/) {} void UpdateAI(const uint32 diff) diff --git a/src/server/scripts/EasternKingdoms/silvermoon_city.cpp b/src/server/scripts/EasternKingdoms/silvermoon_city.cpp index f99fa6119c3..7fb5a028d41 100644 --- a/src/server/scripts/EasternKingdoms/silvermoon_city.cpp +++ b/src/server/scripts/EasternKingdoms/silvermoon_city.cpp @@ -66,11 +66,11 @@ public: spellHit = false; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } - void MoveInLineOfSight(Unit * /*who*/) + void MoveInLineOfSight(Unit* /*who*/) { } diff --git a/src/server/scripts/EasternKingdoms/silverpine_forest.cpp b/src/server/scripts/EasternKingdoms/silverpine_forest.cpp index a1c75f4bbc5..6446b8d2dfe 100644 --- a/src/server/scripts/EasternKingdoms/silverpine_forest.cpp +++ b/src/server/scripts/EasternKingdoms/silverpine_forest.cpp @@ -91,7 +91,7 @@ public: { } - void JustDied(Unit * /*who*/) + void JustDied(Unit* /*who*/) { me->setFaction(68); } @@ -271,7 +271,7 @@ public: } } - void EnterCombat(Unit * /*who*/){} + void EnterCombat(Unit* /*who*/){} void JustSummoned(Creature *pSummoned) { @@ -308,7 +308,7 @@ public: } } - void JustDied(Unit * /*pKiller*/) + void JustDied(Unit* /*pKiller*/) { if (PlayerGUID) if (Player *pPlayer = Unit::GetPlayer(*me, PlayerGUID)) diff --git a/src/server/scripts/EasternKingdoms/stranglethorn_vale.cpp b/src/server/scripts/EasternKingdoms/stranglethorn_vale.cpp index 18ba799a60a..b213190425c 100644 --- a/src/server/scripts/EasternKingdoms/stranglethorn_vale.cpp +++ b/src/server/scripts/EasternKingdoms/stranglethorn_vale.cpp @@ -78,7 +78,7 @@ public: return; } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { diff --git a/src/server/scripts/EasternKingdoms/undercity.cpp b/src/server/scripts/EasternKingdoms/undercity.cpp index ea78f0892e0..cbd9c1fe665 100644 --- a/src/server/scripts/EasternKingdoms/undercity.cpp +++ b/src/server/scripts/EasternKingdoms/undercity.cpp @@ -101,7 +101,7 @@ public: targetGUID = 0; } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void JustSummoned(Creature *summoned) { @@ -177,7 +177,7 @@ public: EventCast = true; } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { diff --git a/src/server/scripts/Examples/example_spell.cpp b/src/server/scripts/Examples/example_spell.cpp index 453a9414234..4e50126cf92 100644 --- a/src/server/scripts/Examples/example_spell.cpp +++ b/src/server/scripts/Examples/example_spell.cpp @@ -280,7 +280,7 @@ class spell_ex_66244 : public SpellScriptLoader { } - bool DoCheckAreaTarget(Unit * proposedTarget) + bool DoCheckAreaTarget(Unit* proposedTarget) { }*/ }; @@ -379,7 +379,7 @@ class spell_ex : public SpellScriptLoader { PrepareSpellScript(spell_ex_SpellScript); - //bool Validate(SpellEntry const * spellEntry){return true;} + //bool Validate(SpellEntry const* spellEntry){return true;} //bool Load(){return true;} //void Unload(){} diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp index 424ddcc16e4..23c5b18e28e 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp @@ -51,7 +51,7 @@ class go_blackfathom_fire : public GameObjectScript public: go_blackfathom_fire() : GameObjectScript("go_blackfathom_fire") { } - bool OnGossipHello(Player * /*pPlayer*/, GameObject* pGo) + bool OnGossipHello(Player* /*pPlayer*/, GameObject* pGo) { InstanceScript *pInstance = pGo->GetInstanceScript(); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp index 978b0b822b1..59878e2e354 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp @@ -96,7 +96,7 @@ public: pInstance->SetData(DATA_ANETHERONEVENT, NOT_STARTED); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { if (pInstance && IsEvent) pInstance->SetData(DATA_ANETHERONEVENT, IN_PROGRESS); @@ -104,7 +104,7 @@ public: me->MonsterYell(SAY_ONAGGRO, LANG_UNIVERSAL, 0); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { switch (urand(0, 2)) { @@ -273,15 +273,15 @@ public: CheckTimer = 5000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp index 8b2aa35e2ce..83077c8250a 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp @@ -148,7 +148,7 @@ public: void MoveInLineOfSight(Unit* /*who*/) {} void EnterCombat(Unit* /*who*/) {} - void DamageTaken(Unit * /*done_by*/, uint32 &damage) { damage = 0; } + void DamageTaken(Unit* /*done_by*/, uint32 &damage) { damage = 0; } }; }; @@ -188,7 +188,7 @@ public: void EnterCombat(Unit* /*who*/) {} - void DamageTaken(Unit * /*done_by*/, uint32 &damage) { damage = 0; } + void DamageTaken(Unit* /*done_by*/, uint32 &damage) { damage = 0; } void UpdateAI(const uint32 diff) { @@ -291,7 +291,7 @@ public: IsChanneling = false; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { me->InterruptSpell(CURRENT_CHANNELED_SPELL); DoScriptText(SAY_AGGRO, me); @@ -301,7 +301,7 @@ public: pInstance->SetData(DATA_ARCHIMONDEEVENT, IN_PROGRESS); } - void KilledUnit(Unit * victim) + void KilledUnit(Unit* victim) { DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp index 77a3549dbc3..688e6b7f4e1 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp @@ -89,7 +89,7 @@ public: pInstance->SetData(DATA_AZGALOREVENT, NOT_STARTED); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { if (pInstance && IsEvent) pInstance->SetData(DATA_AZGALOREVENT, IN_PROGRESS); @@ -97,7 +97,7 @@ public: me->MonsterYell(SAY_ONAGGRO, LANG_UNIVERSAL, 0); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { switch (urand(0, 2)) { @@ -239,11 +239,11 @@ public: CheckTimer = 5000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { } @@ -257,7 +257,7 @@ public: AttackStart(who); } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp index 86e1348f399..5b4ceada677 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp @@ -84,7 +84,7 @@ public: pInstance->SetData(DATA_KAZROGALEVENT, NOT_STARTED); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { if (pInstance && IsEvent) pInstance->SetData(DATA_KAZROGALEVENT, IN_PROGRESS); @@ -92,7 +92,7 @@ public: me->MonsterYell(SAY_ONAGGRO, LANG_UNIVERSAL, 0); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { switch (urand(0, 2)) { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp index fdd046b454f..09e254c4339 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp @@ -84,7 +84,7 @@ public: pInstance->SetData(DATA_RAGEWINTERCHILLEVENT, NOT_STARTED); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { if (pInstance && IsEvent) pInstance->SetData(DATA_RAGEWINTERCHILLEVENT, IN_PROGRESS); @@ -92,7 +92,7 @@ public: me->MonsterYell(SAY_ONAGGRO, LANG_UNIVERSAL, 0); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { switch (urand(0, 1)) { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp index 1db2a350dac..809a0ec9438 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp @@ -422,7 +422,7 @@ void hyjalAI::EnterEvadeMode() me->SetLootRecipient(NULL); } -void hyjalAI::EnterCombat(Unit * /*who*/) +void hyjalAI::EnterCombat(Unit* /*who*/) { if (IsDummy)return; for (uint8 i = 0; i < HYJAL_AI_MAX_SPELLS; ++i) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h index 322c2572a21..faf4d3d4393 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h @@ -177,7 +177,7 @@ struct hyjalAI : public npc_escortAI void EnterEvadeMode(); // Send creature back to spawn location and evade. - void EnterCombat(Unit * /*who*/); // Used to reset cooldowns for our spells and to inform the raid that we're under attack + void EnterCombat(Unit* /*who*/); // Used to reset cooldowns for our spells and to inform the raid that we're under attack void UpdateAI(const uint32 diff); // Called to summon waves, check for boss deaths and to cast our spells. diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp index c0be18cdb7f..228db1b7cb4 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp @@ -377,7 +377,7 @@ void hyjal_trashAI::UpdateAI(const uint32 /*diff*/) } } -void hyjal_trashAI::JustDied(Unit * /*victim*/) +void hyjal_trashAI::JustDied(Unit* /*victim*/) { if (!pInstance) return; @@ -1193,7 +1193,7 @@ public: } } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { if (pInstance && IsEvent) pInstance->SetData(DATA_TRASH, 0);//signal trash is dead @@ -1445,7 +1445,7 @@ public: } } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp index 426fcf50fc0..20277a15ddd 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp @@ -139,7 +139,7 @@ public: pInstance->SetData(DATA_EPOCH_EVENT, DONE); } - void KilledUnit(Unit * victim) + void KilledUnit(Unit* victim) { if (victim == me) return; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp index 78d22aeb18a..00ca4e325ad 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp @@ -243,7 +243,7 @@ public: } } - void KilledUnit(Unit * victim) + void KilledUnit(Unit* victim) { if (victim == me) return; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp index ff3ca08c3f2..20675eebeba 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp @@ -124,7 +124,7 @@ public: pInstance->SetData(DATA_MEATHOOK_EVENT, DONE); } - void KilledUnit(Unit * victim) + void KilledUnit(Unit* victim) { if (victim == me) return; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp index 7b26df8871a..c3370fb00a7 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp @@ -151,7 +151,7 @@ public: pInstance->SetData(DATA_SALRAMM_EVENT, DONE); } - void KilledUnit(Unit * victim) + void KilledUnit(Unit* victim) { if (victim == me) return; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp index 7a1e8179151..d959adf6c93 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp @@ -398,7 +398,7 @@ public: DoCast(me, SPELL_ARTHAS_AURA); } - void JustDied(Unit * /*killer*/) + void JustDied(Unit* /*killer*/) { if (pInstance) pInstance->SetData(DATA_ARTHAS_EVENT, FAIL); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp index 438a53c16ef..0378ed7581b 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp @@ -73,7 +73,7 @@ public: Frenzy_Timer = 30000+rand()%15000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); } @@ -93,7 +93,7 @@ public: ScriptedAI::MoveInLineOfSight(who); } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { DoScriptText(SAY_DEATH, me); @@ -104,7 +104,7 @@ public: } } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp index 89e2fc763dd..5d3aebc49fe 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp @@ -75,7 +75,7 @@ public: Attraction_Timer = 25000+rand()%10000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); } @@ -95,12 +95,12 @@ public: ScriptedAI::MoveInLineOfSight(who); } - 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); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp index 3151a773a9b..971e7ac741d 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp @@ -74,17 +74,17 @@ public: WingBuffet_Timer = 25000+rand()%10000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { 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*/) { DoScriptText(SAY_DEATH, me); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp index f6f45069b38..ce295b5a301 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp @@ -131,7 +131,7 @@ public: } } - void AttackStart(Unit * /*who*/) + void AttackStart(Unit* /*who*/) { //if (pInstance && pInstance->GetData(TYPE_MEDIVH) == IN_PROGRESS) //return; @@ -139,7 +139,7 @@ public: //ScriptedAI::AttackStart(who); } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void SpellHit(Unit* /*caster*/, const SpellEntry* spell) { @@ -291,7 +291,7 @@ public: else mWaveId = 1; } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void DoSummonAtRift(uint32 creature_entry) { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp index f2dd3e2d481..239aba88ad2 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp @@ -76,19 +76,19 @@ public: Consecration_Timer = 8000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { //This is not correct. Should taunt Thrall before engage in combat DoScriptText(SAY_TAUNT1, me); DoScriptText(SAY_TAUNT2, 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); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp index ac934c4e5f4..2df7cf9b170 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp @@ -74,17 +74,17 @@ public: Mda_Timer = 40000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2), 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); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp index 0cdbcf9fc20..9bad835943f 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp @@ -132,17 +132,17 @@ public: ExplodingShout_Timer = 25000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { 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*/) { DoScriptText(SAY_DEATH, me); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp index ff296d3ce3b..455c95dc8cc 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp @@ -528,7 +528,7 @@ public: } } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_TH_RANDOM_KILL1, SAY_TH_RANDOM_KILL2, SAY_TH_RANDOM_KILL3), me); } diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp index 5ff4d8e1381..1016207febe 100644 --- a/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp @@ -54,7 +54,7 @@ public: CorruptForces_Timer = 30000; } - void EnterCombat(Unit * /*who*/) { } + void EnterCombat(Unit* /*who*/) { } void JustDied(Unit* /*Killer*/) { diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_landslide.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_landslide.cpp index e13de82e22d..00328bead1f 100644 --- a/src/server/scripts/Kalimdor/Maraudon/boss_landslide.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/boss_landslide.cpp @@ -54,7 +54,7 @@ public: Landslide_Timer = 0; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp index a8f088f343b..431c0a43f17 100644 --- a/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp @@ -57,7 +57,7 @@ public: Invisible = false; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp index 147e20fab80..926fcf18850 100644 --- a/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp @@ -57,7 +57,7 @@ public: RepulsiveGaze_Timer = 23000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp index 596d4eb8bbe..2aa6e49fd88 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp @@ -225,7 +225,7 @@ public: DoScriptText(SAY_KILL, me); } - void SpellHit(Unit * /*pCaster*/, const SpellEntry* pSpell) + void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell) { if (pSpell->Id == SPELL_BREATH_EAST_TO_WEST || pSpell->Id == SPELL_BREATH_WEST_TO_EAST || diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp index 44e62de17b7..5096f9d4604 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp @@ -67,7 +67,7 @@ public: Hp = false; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); } diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp index c870d049461..3bc09e57de0 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp @@ -74,13 +74,13 @@ public: pInstance->SetData(DATA_AYAMISS_EVENT, NOT_STARTED); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { if (pInstance) pInstance->SetData(DATA_AYAMISS_EVENT, IN_PROGRESS); } - void JustDied(Unit * /*killer*/) + void JustDied(Unit* /*killer*/) { if (pInstance) pInstance->SetData(DATA_AYAMISS_EVENT, DONE); diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp index b0acd48c83c..8854dde89df 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp @@ -56,13 +56,13 @@ public: pInstance->SetData(DATA_BURU_EVENT, NOT_STARTED); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { if (pInstance) pInstance->SetData(DATA_BURU_EVENT, IN_PROGRESS); } - void JustDied(Unit * /*killer*/) + void JustDied(Unit* /*killer*/) { if (pInstance) pInstance->SetData(DATA_BURU_EVENT, DONE); diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp index 38477ab8486..ae55a3821eb 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp @@ -75,13 +75,13 @@ public: pInstance->SetData(DATA_KURINNAXX_EVENT, NOT_STARTED); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { if (pInstance) pInstance->SetData(DATA_KURINNAXX_EVENT, IN_PROGRESS); } - void JustDied(Unit * /*killer*/) + void JustDied(Unit* /*killer*/) { if (pInstance) pInstance->SetData(DATA_KURINNAXX_EVENT, DONE); diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp index 37579f32a5e..80e29f361c1 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp @@ -88,7 +88,7 @@ public: pInstance->SetData(DATA_MOAM_EVENT, NOT_STARTED); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(EMOTE_AGGRO, me); @@ -96,7 +96,7 @@ public: pInstance->SetData(DATA_MOAM_EVENT, IN_PROGRESS); } - void JustDied(Unit * /*killer*/) + void JustDied(Unit* /*killer*/) { if (pInstance) pInstance->SetData(DATA_MOAM_EVENT, DONE); diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp index b0b5f063948..699735933ea 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp @@ -64,13 +64,13 @@ public: pInstance->SetData(DATA_OSSIRIAN_EVENT, NOT_STARTED); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { if (pInstance) pInstance->SetData(DATA_OSSIRIAN_EVENT, IN_PROGRESS); } - void JustDied(Unit * /*killer*/) + void JustDied(Unit* /*killer*/) { if (pInstance) pInstance->SetData(DATA_OSSIRIAN_EVENT, DONE); diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp index d798d3f3023..80966ae7dbf 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp @@ -70,13 +70,13 @@ public: pInstance->SetData(DATA_RAJAXX_EVENT, NOT_STARTED); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { if (pInstance) pInstance->SetData(DATA_RAJAXX_EVENT, IN_PROGRESS); } - void JustDied(Unit * /*killer*/) + void JustDied(Unit* /*killer*/) { if (pInstance) pInstance->SetData(DATA_RAJAXX_EVENT, DONE); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp index 50aeea950d8..bf85905098e 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp @@ -73,7 +73,7 @@ public: Death = false; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } @@ -180,7 +180,7 @@ public: } } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } @@ -280,7 +280,7 @@ public: } } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp index 69db789e87d..857dfb7efde 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp @@ -231,7 +231,7 @@ public: pPortal->SetReactState(REACT_PASSIVE); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoZoneInCombat(); if (pInst) @@ -418,7 +418,7 @@ public: } } - void DamageTaken(Unit * /*done_by*/, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) { //No instance if (!pInst) @@ -548,7 +548,7 @@ public: pInst->SetData(DATA_CTHUN_PHASE, PHASE_NOT_STARTED); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoZoneInCombat(); } @@ -884,7 +884,7 @@ public: pInst->SetData(DATA_CTHUN_PHASE, PHASE_CTHUN_DONE); } - void DamageTaken(Unit * /*done_by*/, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) { //No instance if (!pInst) @@ -967,7 +967,7 @@ public: KillSelfTimer = 35000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoZoneInCombat(); } @@ -1042,7 +1042,7 @@ public: EvadeTimer = 5000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoZoneInCombat(); } @@ -1154,7 +1154,7 @@ public: EvadeTimer = 5000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoZoneInCombat(); } @@ -1267,7 +1267,7 @@ public: BeamTimer = 500; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoZoneInCombat(); } diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp index 8a17b7285e2..1189427ff0b 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp @@ -92,7 +92,7 @@ public: Spawn->AI()->AttackStart(victim); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp index 02b671083b3..9a4e035bb92 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp @@ -72,7 +72,7 @@ public: Berserk = false; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp index 439ca675f1e..8c9b1342b40 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp @@ -70,7 +70,7 @@ public: Submerged = false; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoCast(me->getVictim(), SPELL_BIRTH); } diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp index 4c9e2f5eb7f..73fd532b158 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp @@ -79,7 +79,7 @@ public: } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); } @@ -219,7 +219,7 @@ public: AggroReset = false; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp index e6ad78a9d85..6b73e6c4778 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp @@ -111,7 +111,7 @@ public: DoScriptText(SAY_DEATH, me); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { if (IsImage || Images75) return; diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp index ceeb593d131..1eddbace893 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp @@ -103,7 +103,7 @@ struct boss_twinemperorsAI : public ScriptedAI return NULL; } - void DamageTaken(Unit * /*done_by*/, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) { Unit *pOtherBoss = GetOtherBoss(); if (pOtherBoss) @@ -139,7 +139,7 @@ struct boss_twinemperorsAI : public ScriptedAI DoPlaySoundToSet(me, IAmVeklor() ? SOUND_VL_KILL : SOUND_VN_KILL); } - void EnterCombat(Unit * who) + void EnterCombat(Unit* who) { DoZoneInCombat(); Creature *pOtherBoss = GetOtherBoss(); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp index 8f228ada972..0803e0ca70f 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp @@ -149,7 +149,7 @@ public: } } - void AddSentinelsNear(Unit * /*nears*/) + void AddSentinelsNear(Unit* /*nears*/) { std::list<Creature*> assistList; me->GetCreatureListWithEntryInGrid(assistList, 15264, 70.0f); @@ -233,7 +233,7 @@ public: me->AddAura(id, me); } - void EnterCombat(Unit * who) + void EnterCombat(Unit* who) { if (gatherOthersWhenAggro) GetOtherSentinels(who); diff --git a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp index 8eb379024cb..019ee2fb8ae 100644 --- a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp +++ b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp @@ -193,7 +193,7 @@ public: DoScriptText(SAY_ATTACKED, me, who); } - void JustDied(Unit * /*slayer*/) + void JustDied(Unit* /*slayer*/) { if (pInstance) { diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp index 950ed2d7fc3..8582f840c84 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp @@ -322,7 +322,7 @@ public: AttackStartCaster(victim, 10);//keep back & toss bombs/shoot } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { /*if (pInstance) pInstance->SetData(0, DONE);*/ diff --git a/src/server/scripts/Kalimdor/azshara.cpp b/src/server/scripts/Kalimdor/azshara.cpp index 4915eb9625b..357f1dce8c8 100644 --- a/src/server/scripts/Kalimdor/azshara.cpp +++ b/src/server/scripts/Kalimdor/azshara.cpp @@ -61,7 +61,7 @@ public: spellhit = false; } - void EnterCombat(Unit * /*who*/) { } + void EnterCombat(Unit* /*who*/) { } void SpellHit(Unit *Hitter, const SpellEntry *Spellkind) { @@ -508,7 +508,7 @@ public: } } - void AttackStart(Unit * /*who*/) + void AttackStart(Unit* /*who*/) { } diff --git a/src/server/scripts/Kalimdor/azuremyst_isle.cpp b/src/server/scripts/Kalimdor/azuremyst_isle.cpp index 18d59538d32..4540f5296bd 100644 --- a/src/server/scripts/Kalimdor/azuremyst_isle.cpp +++ b/src/server/scripts/Kalimdor/azuremyst_isle.cpp @@ -97,7 +97,7 @@ public: me->SetStandState(UNIT_STAND_STATE_SLEEP); } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void MoveInLineOfSight(Unit *who) { @@ -314,9 +314,9 @@ public: } } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} - void MoveInLineOfSight(Unit * /*who*/) + void MoveInLineOfSight(Unit* /*who*/) { } diff --git a/src/server/scripts/Kalimdor/boss_azuregos.cpp b/src/server/scripts/Kalimdor/boss_azuregos.cpp index 454592e45dd..60c79998bb3 100644 --- a/src/server/scripts/Kalimdor/boss_azuregos.cpp +++ b/src/server/scripts/Kalimdor/boss_azuregos.cpp @@ -72,7 +72,7 @@ public: Enraged = false; } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { diff --git a/src/server/scripts/Kalimdor/durotar.cpp b/src/server/scripts/Kalimdor/durotar.cpp index d32eed17fcd..ff3be7ca8c0 100644 --- a/src/server/scripts/Kalimdor/durotar.cpp +++ b/src/server/scripts/Kalimdor/durotar.cpp @@ -424,7 +424,7 @@ class spell_mount_check : public SpellScriptLoader class spell_mount_check_AuraScript : public AuraScript { PrepareAuraScript(spell_mount_check_AuraScript) - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(SPELL_MOUNTING_CHECK)) return false; @@ -472,7 +472,7 @@ class spell_voljin_war_drums : public SpellScriptLoader class spell_voljin_war_drums_SpellScript : public SpellScript { PrepareSpellScript(spell_voljin_war_drums_SpellScript) - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(SPELL_MOTIVATE_1)) return false; diff --git a/src/server/scripts/Kalimdor/moonglade.cpp b/src/server/scripts/Kalimdor/moonglade.cpp index c3706ae377f..82c705c3efa 100644 --- a/src/server/scripts/Kalimdor/moonglade.cpp +++ b/src/server/scripts/Kalimdor/moonglade.cpp @@ -320,7 +320,7 @@ public: } } - void JustDied(Unit * /*killer*/) + void JustDied(Unit* /*killer*/) { if (!PlayerGUID) return; diff --git a/src/server/scripts/Kalimdor/orgrimmar.cpp b/src/server/scripts/Kalimdor/orgrimmar.cpp index 1d487d2a023..7004bbea2d4 100644 --- a/src/server/scripts/Kalimdor/orgrimmar.cpp +++ b/src/server/scripts/Kalimdor/orgrimmar.cpp @@ -216,7 +216,7 @@ public: Shock_Timer = 8000; } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { diff --git a/src/server/scripts/Kalimdor/the_barrens.cpp b/src/server/scripts/Kalimdor/the_barrens.cpp index 9c425d7e1fd..b721d9106af 100644 --- a/src/server/scripts/Kalimdor/the_barrens.cpp +++ b/src/server/scripts/Kalimdor/the_barrens.cpp @@ -265,7 +265,7 @@ public: me->HandleEmoteCommand(EMOTE_ONESHOT_SALUTE); } - void SpellHit(Unit * /*caster*/, const SpellEntry *spell) + void SpellHit(Unit* /*caster*/, const SpellEntry *spell) { if (spell->Id == SPELL_FLARE || spell->Id == SPELL_FOLLY) { @@ -381,7 +381,7 @@ public: BigWill = 0; } - void EnterCombat(Unit * /*who*/) { } + void EnterCombat(Unit* /*who*/) { } void MoveInLineOfSight(Unit *who) { @@ -394,7 +394,7 @@ public: } } - void KilledUnit(Unit * /*victim*/) { } + void KilledUnit(Unit* /*victim*/) { } void UpdateAI(const uint32 diff) { diff --git a/src/server/scripts/Kalimdor/thunder_bluff.cpp b/src/server/scripts/Kalimdor/thunder_bluff.cpp index 7dd6b5b21eb..db326f7657f 100644 --- a/src/server/scripts/Kalimdor/thunder_bluff.cpp +++ b/src/server/scripts/Kalimdor/thunder_bluff.cpp @@ -90,7 +90,7 @@ public: Uppercut_Timer = 10000; } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp index 4e751419303..38acda8e5ca 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp @@ -159,7 +159,7 @@ public: return NULL; } - void EnterCombat(Unit * /*pWho*/) + void EnterCombat(Unit* /*pWho*/) { DoScriptText(SAY_AGGRO, me); if (pInstance) @@ -325,7 +325,7 @@ public: } } - void JustDied(Unit * /*pKiller*/) + void JustDied(Unit* /*pKiller*/) { DoScriptText(SAY_DEATH, me); lSummons.DespawnAll(); diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp index 9048d2cfae8..3184500870b 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp @@ -207,7 +207,7 @@ public: pInstance->DoCompleteAchievement(ACHIEV_WATH_HIM_DIE); } - void KilledUnit(Unit * victim) + void KilledUnit(Unit* victim) { if (victim == me) return; diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp index 73ab6501ffa..2a3fbeb8859 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp @@ -83,7 +83,7 @@ public: } } - void JustDied(Unit * /*Killer*/) + void JustDied(Unit* /*Killer*/) { if (pInstance) { @@ -92,7 +92,7 @@ public: } } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { if (pInstance) pInstance->SetData(DATA_AMANITAR_EVENT, IN_PROGRESS); @@ -195,8 +195,8 @@ public: } } - void EnterCombat(Unit * /*who*/) {} - void AttackStart(Unit * /*victim*/) {} + void EnterCombat(Unit* /*who*/) {} + void AttackStart(Unit* /*victim*/) {} void UpdateAI(const uint32 diff) { diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp index 4ab8519ac4a..8a37f409f72 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp @@ -95,7 +95,7 @@ public: pInstance->SetData(DATA_ELDER_NADOX_EVENT, NOT_STARTED); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_DEATH, me); @@ -103,7 +103,7 @@ public: pInstance->SetData(DATA_ELDER_NADOX_EVENT, IN_PROGRESS); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); } @@ -212,13 +212,13 @@ public: uiSprintTimer = 10*IN_MILLISECONDS; } - void JustDied(Unit * /*killer*/) + void JustDied(Unit* /*killer*/) { if (me->GetEntry() == MOB_AHNKAHAR_GUARDIAN_ENTRY) DeadAhnkaharGuardian = true; } - void EnterCombat(Unit * /*who*/){} + void EnterCombat(Unit* /*who*/){} void UpdateAI(const uint32 diff) { diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp index da3eff81e6e..75a0420231c 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp @@ -88,7 +88,7 @@ public: return 100*(me->GetHealth()-damage)/me->GetMaxHealth(); } - void DamageTaken(Unit * /*pAttacker*/, uint32 &damage) + void DamageTaken(Unit* /*pAttacker*/, uint32 &damage) { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE)) damage = 0; @@ -307,7 +307,7 @@ public: ResetPlayersPhaseMask(); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); } diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp index 5bcddf61bbc..951af65fced 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp @@ -266,7 +266,7 @@ public: pInstance->SetData(DATA_PRINCE_TALDARAM_EVENT, DONE); } - void KilledUnit(Unit * victim) + void KilledUnit(Unit* victim) { if (victim == me) return; @@ -357,8 +357,8 @@ public: uiDespawnTimer = 10*IN_MILLISECONDS; } - void EnterCombat(Unit * /*who*/) {} - void MoveInLineOfSight(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} void JustDied(Unit* /*who*/) { @@ -385,7 +385,7 @@ class prince_taldaram_sphere : public GameObjectScript public: prince_taldaram_sphere() : GameObjectScript("prince_taldaram_sphere") { } - bool OnGossipHello(Player * /*pPlayer*/, GameObject *pGO) + bool OnGossipHello(Player* /*pPlayer*/, GameObject *pGO) { InstanceScript *pInstance = pGO->GetInstanceScript(); diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp index f125630fc45..79a864d02b1 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp @@ -315,7 +315,7 @@ class spell_baltharus_enervating_brand : public SpellScriptLoader uint32 triggerSpellId = GetSpellProto()->EffectTriggerSpell[aurEff->GetEffIndex()]; target->CastSpell(target, triggerSpellId, true); - if (Unit * caster = GetCaster()) + if (Unit* caster = GetCaster()) if (target->GetDistance(caster) <= 12.0f) target->CastSpell(caster, SPELL_SIPHONED_MIGHT, true); } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp index 5309cfdd747..3e8ca0a31d2 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp @@ -126,7 +126,7 @@ public: bDone = false; } - void DamageTaken(Unit * /*done_by*/, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) { if (damage >= me->GetHealth()) { @@ -252,7 +252,7 @@ public: me->RemoveAura(SPELL_SHIELD); } - void DamageTaken(Unit * /*done_by*/, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) { if (damage >= me->GetHealth()) { diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp index 45ce90ffa4a..2672a22d26c 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp @@ -191,7 +191,7 @@ public: lSummons.DespawnAll(); } - void KilledUnit(Unit * victim) + void KilledUnit(Unit* victim) { if (victim == me) return; diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp index 0f3725dce21..f6f8624664b 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp @@ -220,7 +220,7 @@ public: } } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2), me); } diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp index 7c605d6d6ca..db285306071 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp @@ -170,7 +170,7 @@ public: } } - void KilledUnit(Unit * victim) + void KilledUnit(Unit* victim) { if (victim == me) return; diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp index 7c0afe830f2..ce297af9fd8 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp @@ -105,7 +105,7 @@ class boss_bronjahm : public CreatureScript instance->SetBossState(DATA_BRONJAHM, DONE); } - void KilledUnit(Unit * who) + void KilledUnit(Unit* who) { if (who->GetTypeId() == TYPEID_PLAYER) DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp index 63c8cbe85b2..fb0c516cf5b 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp @@ -162,7 +162,7 @@ class boss_devourer_of_souls : public CreatureScript instance->SetData(DATA_DEVOURER_EVENT, IN_PROGRESS); } - void DamageTaken(Unit * /*pDoneBy*/, uint32 &uiDamage) + void DamageTaken(Unit* /*pDoneBy*/, uint32 &uiDamage) { if (mirroredSoulTarget && me->HasAura(SPELL_MIRRORED_SOUL)) { diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp index 28d9e406e92..2bfdcbc60e2 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp @@ -90,7 +90,7 @@ public: pInstance->SetData(DATA_FALRIC_EVENT, DONE); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp index 6574846831e..2f0e9f4703e 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp @@ -87,7 +87,7 @@ public: pInstance->SetData(DATA_MARWYN_EVENT, DONE); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp index a6307f3c796..ee914e9acb2 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp @@ -796,7 +796,7 @@ public: { } - void JustDied(Unit * /*pWho*/) + void JustDied(Unit* /*pWho*/) { DoCast(SPELL_HALLUCINATION_2); } diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h index c7d1baabe28..fa31154e86c 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h @@ -96,7 +96,7 @@ struct boss_horAI : ScriptedAI me->SetReactState(REACT_PASSIVE); } - void DamageTaken(Unit * /*pWho*/, uint32 &uiDamage) + void DamageTaken(Unit* /*pWho*/, uint32 &uiDamage) { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) uiDamage = 0; diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp index 6462485282a..1c454738484 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp @@ -160,7 +160,7 @@ class boss_ick : public CreatureScript return ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_KRICK)); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { if (Creature* krick = GetKrick()) DoScriptText(SAY_KRICK_AGGRO, krick); diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp index 3a555da9a81..8153b748933 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp @@ -465,7 +465,7 @@ class spell_tyrannus_mark_of_rimefang : public SpellScriptLoader void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { - Unit * caster = GetCaster(); + Unit* caster = GetCaster(); if (!caster || caster->GetTypeId() != TYPEID_UNIT) return; diff --git a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp index d0825f79af0..b7ecb36e8a6 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp @@ -152,7 +152,7 @@ public: InstanceScript* pInstance; - void JustDied(Unit * /*who*/) + void JustDied(Unit* /*who*/) { if (pInstance) { diff --git a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp index 968be40223b..c1b82f71687 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp @@ -272,7 +272,7 @@ public: } } - void KilledUnit(Unit * victim) + void KilledUnit(Unit* victim) { if (victim == me) return; diff --git a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp index 2d1a6b4a5ea..5fc1f5d5f07 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp @@ -176,7 +176,7 @@ public: pInstance->SetData(DATA_SLAD_RAN_EVENT, DONE); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); } diff --git a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp index e21b3ee5e10..2186aa205ab 100644 --- a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp +++ b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp @@ -519,7 +519,7 @@ class go_gundrak_altar : public GameObjectScript public: go_gundrak_altar() : GameObjectScript("go_gundrak_altar") { } - bool OnGossipHello(Player * /*pPlayer*/, GameObject* pGO) + bool OnGossipHello(Player* /*pPlayer*/, GameObject* pGO) { InstanceScript *pInstance = pGO->GetInstanceScript(); uint64 uiStatue = 0; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp index c2f2b93089c..72421d23a36 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp @@ -439,7 +439,7 @@ class spell_festergut_blighted_spores : public SpellScriptLoader void ExtraEffect(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { - if (Unit * caster = GetCaster()) + if (Unit* caster = GetCaster()) { uint32 inoculatedId = sSpellMgr->GetSpellIdForDifficulty(SPELL_INOCULATED, caster); uint32 currStack = 0; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp index 999676d736d..e7999b1ec3d 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp @@ -107,7 +107,7 @@ public: if (instance) instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { _EnterCombat(); DoScriptText(SAY_AGGRO, me); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp index fe0e94c76e1..2be01e72177 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp @@ -315,7 +315,7 @@ public: DoScriptText(SAY_DEATH[id], me); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { _EnterCombat(); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp index dccce84818b..6c7eab3cbbe 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp @@ -75,7 +75,7 @@ public: BossAI::MoveInLineOfSight(who); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { _EnterCombat(); events.ScheduleEvent(EVENT_WOUND, 10000); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp index bd2c05b3c01..209a0391736 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp @@ -182,7 +182,7 @@ class boss_gothik : public CreatureScript thirtyPercentReached = false; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { for (uint32 i = 0; i < POS_LIVE; ++i) if (Creature* trigger = DoSummon(WORLD_TRIGGER, PosSummonLive[i])) diff --git a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp index 098b22e30ac..a5ccbd2f6a5 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp @@ -50,7 +50,7 @@ public: me->ApplySpellImmune(0, IMMUNITY_ID, SPELL_POISON_CLOUD_ADD, true); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { _EnterCombat(); events.ScheduleEvent(EVENT_CLOUD, 15000); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp index 5bf864d8ed3..6dcfea6a483 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp @@ -72,7 +72,7 @@ public: DoScriptText(SAY_DEATH, me); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { _EnterCombat(); DoScriptText(SAY_AGGRO, me); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp index a615f7437c5..de5f3cdd1be 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp @@ -50,7 +50,7 @@ public: { boss_loathebAI(Creature *c) : BossAI(c, BOSS_LOATHEB) {} - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { _EnterCombat(); events.ScheduleEvent(EVENT_AURA, 10000); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp index 50ee49203d5..12a1abb043f 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp @@ -72,7 +72,7 @@ public: bool enraged; - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { _EnterCombat(); enraged = false; @@ -171,7 +171,7 @@ public: victim->CastSpell(victim, me->m_spells[0], true, NULL, NULL, me->GetGUID()); } - void JustDied(Unit * /*killer*/) + void JustDied(Unit* /*killer*/) { if (me->m_spells[0] && victimGUID) if (Unit *victim = Unit::GetUnit(*me, victimGUID)) diff --git a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp index 80174a610ee..21d8a1af44c 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp @@ -86,7 +86,7 @@ public: _Reset(); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { _EnterCombat(); DoScriptText(SAY_AGGRO, me); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp index e2fe4135996..3906528a1a0 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp @@ -86,7 +86,7 @@ public: DoScriptText(SAY_DEATH, me); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { _EnterCombat(); Enraged = false; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp index 7056eb0ea33..5b0420cd3bc 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp @@ -88,7 +88,7 @@ public: me->CastSpell(me, SPELL_HOPELESS, true); // TODO: this may affect other creatures } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { _EnterCombat(); DoPlaySoundToSet(me, SOUND_AGGRO); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp index 9bd06669d5c..916e096be92 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp @@ -120,7 +120,7 @@ public: CheckFrostResistTimer = 5000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { _EnterCombat(); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp index c61f5bddc7d..6d6c824e04b 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp @@ -180,7 +180,7 @@ public: } } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { _EnterCombat(); DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); @@ -189,7 +189,7 @@ public: events.ScheduleEvent(EVENT_BERSERK, 360000); } - void DamageTaken(Unit * /*pDoneBy*/, uint32 & /*uiDamage*/) + void DamageTaken(Unit* /*pDoneBy*/, uint32 & /*uiDamage*/) { me->SetReactState(REACT_AGGRESSIVE); } @@ -286,12 +286,12 @@ public: magneticPullTimer = 20000; } - void EnterCombat(Unit * /*pWho*/) + void EnterCombat(Unit* /*pWho*/) { DoCast(SPELL_STALAGG_TESLA); } - void JustDied(Unit * /*killer*/) + void JustDied(Unit* /*killer*/) { if (pInstance) if (Creature *pThaddius = me->GetCreature(*me, pInstance->GetData64(DATA_THADDIUS))) @@ -370,12 +370,12 @@ public: staticFieldTimer = 5000; } - void EnterCombat(Unit * /*pWho*/) + void EnterCombat(Unit* /*pWho*/) { DoCast(SPELL_FEUGEN_TESLA); } - void JustDied(Unit * /*killer*/) + void JustDied(Unit* /*killer*/) { if (pInstance) if (Creature *pThaddius = me->GetCreature(*me, pInstance->GetData64(DATA_THADDIUS))) diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp index 908813e241c..f65fab3310e 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp @@ -671,7 +671,7 @@ class spell_malygos_vortex_visual : public SpellScriptLoader void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { - if (Unit * caster = GetCaster()) + if (Unit* caster = GetCaster()) { std::list<HostileReference*> &m_threatlist = caster->getThreatManager().getThreatList(); for (std::list<HostileReference*>::const_iterator itr = m_threatlist.begin(); itr!= m_threatlist.end(); ++itr) diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp index 001547379a3..415c510f001 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp @@ -212,7 +212,7 @@ public: DoCast(me, SPELL_ARCANEFORM, false); } - void JustDied(Unit * /*killer*/) + void JustDied(Unit* /*killer*/) { if (Creature* pAnomalus = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_ANOMALUS) : 0)) CAST_AI(boss_anomalus::boss_anomalusAI, pAnomalus->AI())->bDeadChaoticRift = true; diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp index c7fa97899a1..7a5261a0548 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp @@ -118,7 +118,7 @@ public: } } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(SAY_SLAY, me); } @@ -228,7 +228,7 @@ class containment_sphere : public GameObjectScript public: containment_sphere() : GameObjectScript("containment_sphere") { } - bool OnGossipHello(Player * /*pPlayer*/, GameObject *pGO) + bool OnGossipHello(Player* /*pPlayer*/, GameObject *pGO) { InstanceScript *pInstance = pGO->GetInstanceScript(); diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp index 1fd13bc1619..66d98186975 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp @@ -140,7 +140,7 @@ public: } } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(SAY_KILL, me); } diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp index 360e003c0ca..aff5f15c923 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp @@ -113,7 +113,7 @@ public: pInstance->SetData(DATA_ORMOROK_EVENT, DONE); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(SAY_KILL, me); } diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp index ec8abc257d6..3bd8531aa9f 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp @@ -254,7 +254,7 @@ class spell_eregos_planar_shift : public SpellScriptLoader void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { - if (Unit * caster = GetCaster()) + if (Unit* caster = GetCaster()) if (Creature* creatureCaster = caster->ToCreature()) creatureCaster->AI()->DoAction(ACTION_SET_NORMAL_EVENTS); } diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp index 6ba9db3d407..5d35b94217e 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp @@ -246,13 +246,13 @@ class spell_varos_centrifuge_shield : public SpellScriptLoader bool Load() { - Unit * caster = GetCaster(); + Unit* caster = GetCaster(); return (caster && caster->ToCreature()); } void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { - if (Unit * caster = GetCaster()) + if (Unit* caster = GetCaster()) { // flags taken from sniffs // UNIT_FLAG_UNK_9 -> means passive but it is not yet implemented in core @@ -266,7 +266,7 @@ class spell_varos_centrifuge_shield : public SpellScriptLoader void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { - if (Unit * caster = GetCaster()) + if (Unit* caster = GetCaster()) { caster->ToCreature()->SetReactState(REACT_AGGRESSIVE); caster->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNK_15|UNIT_FLAG_PASSIVE|UNIT_FLAG_OOC_NOT_ATTACKABLE|UNIT_FLAG_UNK_6); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp index 3a14946dfc0..fb2432e6f26 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp @@ -138,7 +138,7 @@ public: pInstance->SetData(TYPE_IONAR, DONE); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); } @@ -185,7 +185,7 @@ public: } } - void DamageTaken(Unit * /*pDoneBy*/, uint32 &uiDamage) + void DamageTaken(Unit* /*pDoneBy*/, uint32 &uiDamage) { if (!me->IsVisible()) uiDamage = 0; @@ -332,7 +332,7 @@ public: me->DespawnOrUnsummon(); } - void DamageTaken(Unit * /*pDoneBy*/, uint32 &uiDamage) + void DamageTaken(Unit* /*pDoneBy*/, uint32 &uiDamage) { uiDamage = 0; } diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp index 1f11e7a254a..eaf9f71f6fe 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp @@ -150,7 +150,7 @@ public: pInstance->SetData(DATA_KRYSTALLUS_EVENT, DONE); } - void KilledUnit(Unit * victim) + void KilledUnit(Unit* victim) { if (victim == me) return; diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp index 7cf99900672..235a36e661a 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp @@ -165,7 +165,7 @@ public: pInstance->SetData(DATA_MAIDEN_OF_GRIEF_EVENT, DONE); } - void KilledUnit(Unit * victim) + void KilledUnit(Unit* victim) { if (victim == me) return; diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp index 92ec5db126e..2377c5e908a 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp @@ -227,7 +227,7 @@ public: pInstance->DoCompleteAchievement(ACHIEV_ABUSE_THE_OOZE); } } - void KilledUnit(Unit * victim) + void KilledUnit(Unit* victim) { if (victim == me) return; diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp index fee78783528..3003ebc2b7f 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp @@ -126,7 +126,7 @@ public: pInstance->SetData(BOSS_ALGALON, IN_PROGRESS); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp index b739e41150c..67ea6bd23ba 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp @@ -230,7 +230,7 @@ public: InstanceScript* pInstance; uint32 phase; - void EnterCombat(Unit * who) + void EnterCombat(Unit* who) { StartEncounter(pInstance, me, who); DoScriptText(SAY_STEELBREAKER_AGGRO, me); @@ -291,7 +291,7 @@ public: pInstance->SetData(BOSS_ASSEMBLY_OF_IRON, DONE); } - void KilledUnit(Unit * /*who*/) + void KilledUnit(Unit* /*who*/) { DoScriptText(RAND(SAY_STEELBREAKER_SLAY_1, SAY_STEELBREAKER_SLAY_2), me); @@ -299,7 +299,7 @@ public: DoCast(me, SPELL_ELECTRICAL_CHARGE); } - void SpellHit(Unit * /*from*/, const SpellEntry *spell) + void SpellHit(Unit* /*from*/, const SpellEntry *spell) { if (spell->Id == SPELL_SUPERCHARGE) DoAction(EVENT_UPDATEPHASE); @@ -438,12 +438,12 @@ public: pInstance->SetData(BOSS_ASSEMBLY_OF_IRON, DONE); } - void KilledUnit(Unit * /*who*/) + void KilledUnit(Unit* /*who*/) { DoScriptText(RAND(SAY_MOLGEIM_SLAY_1, SAY_MOLGEIM_SLAY_2), me); } - void SpellHit(Unit * /*from*/, const SpellEntry *spell) + void SpellHit(Unit* /*from*/, const SpellEntry *spell) { if (spell->Id == SPELL_SUPERCHARGE) DoAction(EVENT_UPDATEPHASE); @@ -683,12 +683,12 @@ public: pInstance->SetData(BOSS_ASSEMBLY_OF_IRON, DONE); } - void KilledUnit(Unit * /*who*/) + void KilledUnit(Unit* /*who*/) { DoScriptText(RAND(SAY_BRUNDIR_SLAY_1, SAY_BRUNDIR_SLAY_2), me); } - void SpellHit(Unit * /*from*/, const SpellEntry *spell) + void SpellHit(Unit* /*from*/, const SpellEntry *spell) { if (spell->Id == SPELL_SUPERCHARGE) DoAction(EVENT_UPDATEPHASE); diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_auriaya.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_auriaya.cpp index 56930a0833a..c2d81a5f562 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_auriaya.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_auriaya.cpp @@ -71,7 +71,7 @@ public: DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { DoScriptText(SAY_DEATH, me); _JustDied(); diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_general_vezax.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_general_vezax.cpp index 79570d86a0e..c4651612aed 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_general_vezax.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_general_vezax.cpp @@ -448,7 +448,7 @@ class spell_mark_of_the_faceless : public SpellScriptLoader void HandleEffectPeriodic(AuraEffect const* aurEff) { - if (Unit * caster = GetCaster()) + if (Unit* caster = GetCaster()) caster->CastCustomSpell(SPELL_MARK_OF_THE_FACELESS_DAMAGE, SPELLVALUE_BASE_POINT1, aurEff->GetAmount(), GetTarget(), true); } diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp index 5faa94ed5c8..662f1225b74 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp @@ -432,7 +432,7 @@ class spell_ignis_slag_pot : public SpellScriptLoader class spell_ignis_slag_pot_AuraScript : public AuraScript { PrepareAuraScript(spell_ignis_slag_pot_AuraScript) - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(SPELL_SLAG_POT_DAMAGE)) return false; @@ -443,13 +443,13 @@ class spell_ignis_slag_pot : public SpellScriptLoader return true; } - void HandleEffectPeriodic(AuraEffect const * aurEff) + void HandleEffectPeriodic(AuraEffect const* aurEff) { Unit* aurEffCaster = aurEff->GetCaster(); if (!aurEffCaster) return; - Unit * target = GetTarget(); + Unit* target = GetTarget(); aurEffCaster->CastSpell(target, SPELL_SLAG_POT_DAMAGE, true); if (target->isAlive() && !GetDuration()) target->CastSpell(target, SPELL_SLAG_IMBUED, true); diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp index 866cb60d3d0..eccc497a748 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp @@ -144,7 +144,7 @@ class boss_kologarn : public CreatureScript eyebeamTarget = 0; } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { DoScriptText(SAY_DEATH, me); DoCast(SPELL_KOLOGARN_PACIFY); @@ -437,7 +437,7 @@ class spell_ulduar_stone_grip_cast_target : public SpellScriptLoader void HandleForceCast(SpellEffIndex i) { - Player * plr = GetHitPlayer(); + Player* plr = GetHitPlayer(); if (!plr) return; diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_thorim.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_thorim.cpp index f8a474f3810..7a16644099d 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_thorim.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_thorim.cpp @@ -68,12 +68,12 @@ public: _EnterEvadeMode(); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { DoScriptText(SAY_DEATH, me); _JustDied(); diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp index ac23c28ddeb..b7f2af822d4 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp @@ -277,7 +277,7 @@ class boss_xt002 : public CreatureScript DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } - void JustDied(Unit * /*victim*/) + void JustDied(Unit* /*victim*/) { DoScriptText(SAY_DEATH, me); _JustDied(); @@ -441,7 +441,7 @@ public: InstanceScript* m_pInstance; uint32 _damageTaken; - void DamageTaken(Unit * /*pDone*/, uint32 &damage) + void DamageTaken(Unit* /*pDone*/, uint32 &damage) { Creature* XT002 = me->GetCreature(*me, m_pInstance->GetData64(BOSS_XT002)); if (!XT002 || !XT002->AI()) diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp index 8977e4860b6..5938b09e9da 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp @@ -121,7 +121,7 @@ public: pInstance->SetData(DATA_INGVAR_EVENT, NOT_STARTED); } - void DamageTaken(Unit * /*done_by*/, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) { if (damage >= me->GetHealth() && !bIsUndead) { @@ -160,7 +160,7 @@ public: DoScriptText(YELL_AGGRO_2, me); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(YELL_AGGRO_1, me); @@ -176,7 +176,7 @@ public: pInstance->SetData(DATA_INGVAR_EVENT, DONE); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { if (bIsUndead) DoScriptText(YELL_KILL_1, me); @@ -353,7 +353,7 @@ public: void AttackStart(Unit* /*who*/) {} void MoveInLineOfSight(Unit* /*who*/) {} - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { if (uiResurectTimer) @@ -429,7 +429,7 @@ public: } void AttackStart(Unit* /*who*/) {} void MoveInLineOfSight(Unit* /*who*/) {} - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { if (uiDespawnTimer <= diff) diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp index 096ee335077..26c345c4009 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp @@ -152,7 +152,7 @@ public: pInstance->SetData(DATA_PRINCEKELESETH_EVENT, NOT_STARTED); } - void KilledUnit(Unit * victim) + void KilledUnit(Unit* victim) { if (victim == me) return; @@ -286,7 +286,7 @@ public: isDead = false; } - void EnterCombat(Unit * /*who*/){} + void EnterCombat(Unit* /*who*/){} void DamageTaken(Unit *done_by, uint32 &damage) { if (done_by->GetGUID() == me->GetGUID()) diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp index 6ff8e4d9ac8..b3e5e16e2c7 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp @@ -101,7 +101,7 @@ public: } } - void EnterCombat(Unit * who) + void EnterCombat(Unit* who) { if (!ghost && pInstance) { @@ -145,7 +145,7 @@ public: } } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { if (!ghost) { @@ -258,7 +258,7 @@ public: } } - void EnterCombat(Unit * who) + void EnterCombat(Unit* who) { if (!ghost && pInstance) { @@ -304,7 +304,7 @@ public: } } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { if (!ghost) { diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp index 0b9bd93e2ee..a8ccd970e45 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp @@ -71,7 +71,7 @@ public: } } - void JustDied(Unit * /*killer*/) + void JustDied(Unit* /*killer*/) { if (fm_Type == 0) fm_Type = GetForgeMasterType(); if (pInstance) @@ -91,7 +91,7 @@ public: } } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { if (fm_Type == 0) fm_Type = GetForgeMasterType(); if (pInstance) diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp index 7f0d4dbed5b..a4385d861c2 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp @@ -219,7 +219,7 @@ public: pTemp->DisappearAndDie(); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } @@ -834,7 +834,7 @@ class go_palehoof_sphere : public GameObjectScript public: go_palehoof_sphere() : GameObjectScript("go_palehoof_sphere") { } - bool OnGossipHello(Player * /*pPlayer*/, GameObject *pGO) + bool OnGossipHello(Player* /*pPlayer*/, GameObject *pGO) { InstanceScript *pInstance = pGO->GetInstanceScript(); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp index 9da89393f02..7da067b87cb 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp @@ -276,7 +276,7 @@ public: Summons.Despawn(pSummoned); } - void SpellHit(Unit * /*caster*/, const SpellEntry *spell) + void SpellHit(Unit* /*caster*/, const SpellEntry *spell) { if (spell->Id == SPELL_HARPOON_DAMAGE) { @@ -415,7 +415,7 @@ public: m_pInstance->SetData(DATA_SKADI_THE_RUTHLESS_EVENT, DONE); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2), me); } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp index 3c04d522c4c..60e1743a508 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp @@ -356,7 +356,7 @@ public: pInstance->SetData(DATA_KING_YMIRON_EVENT, DONE); } - void KilledUnit(Unit * /*victim*/) + void KilledUnit(Unit* /*victim*/) { DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3, SAY_SLAY_4), me); } diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp index f2c59b63e86..66487c6f6f9 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp @@ -63,7 +63,7 @@ class boss_archavon : public CreatureScript { } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { events.ScheduleEvent(EVENT_ROCK_SHARDS, 15000); events.ScheduleEvent(EVENT_CHOKING_CLOUD, 30000); diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp index 9f4a2eb0192..04935d3fb99 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp @@ -203,7 +203,7 @@ class mob_tempest_minion : public CreatureScript } } - void EnterCombat(Unit * who) + void EnterCombat(Unit* who) { DoZoneInCombat(); events.ScheduleEvent(EVENT_SHOCK, 20000); diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp index 9a25c5a5961..3c752ae6ae0 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp @@ -140,7 +140,7 @@ class mob_flame_warder : public CreatureScript events.Reset(); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoZoneInCombat(); diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp index 6041c0dca15..41d43a08f5d 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp @@ -190,7 +190,7 @@ public: killTimer = 60000; // if after this time there is no victim -> destroy! } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoZoneInCombat(); } diff --git a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp index 5ddd2f02a17..017da20a176 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp @@ -149,7 +149,7 @@ public: pInstance->SetData(DATA_CYANIGOSA_EVENT, DONE); } - void KilledUnit(Unit * victim) + void KilledUnit(Unit* victim) { if (victim == me) return; diff --git a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp index c1f7aac1779..d36533cb906 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp @@ -225,7 +225,7 @@ public: } } - void KilledUnit(Unit * victim) + void KilledUnit(Unit* victim) { if (victim == me) return; diff --git a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp index b82996bfc89..3f2ea65958d 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp @@ -320,7 +320,7 @@ public: } } - void KilledUnit(Unit * victim) + void KilledUnit(Unit* victim) { if (victim == me) return; diff --git a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp index 9b6cb6c2964..405c6833693 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp @@ -166,7 +166,7 @@ public: } } - void KilledUnit(Unit * victim) + void KilledUnit(Unit* victim) { if (victim == me) return; diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp index ead4cd439e2..d009063109f 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp @@ -571,9 +571,9 @@ public: bPortalGuardianOrKeeperOrEliteSpawn = false; } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} - void MoveInLineOfSight(Unit * /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { @@ -778,7 +778,7 @@ struct violet_hold_trashAI : public npc_escortAI } } - void JustDied(Unit * /*unit*/) + void JustDied(Unit* /*unit*/) { if (Creature* portal = Unit::GetCreature((*me), pInstance->GetData64(DATA_TELEPORTATION_PORTAL))) CAST_AI(npc_teleportation_portal_vh::npc_teleportation_portalAI, portal->AI())->SummonedMobDied(me); diff --git a/src/server/scripts/Northrend/borean_tundra.cpp b/src/server/scripts/Northrend/borean_tundra.cpp index 6f4dcd50571..00d9b943f0b 100644 --- a/src/server/scripts/Northrend/borean_tundra.cpp +++ b/src/server/scripts/Northrend/borean_tundra.cpp @@ -353,8 +353,8 @@ public: mob_nerubar_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) { @@ -588,10 +588,10 @@ public: Phase = 1; go_caribouGUID = 0; } - void EnterCombat(Unit * /*who*/) {} - void MoveInLineOfSight(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} - void JustDied(Unit * /*who*/) + void JustDied(Unit* /*who*/) { if (GameObject *go_caribou = me->GetMap()->GetGameObject(go_caribouGUID)) go_caribou->SetLootState(GO_JUST_DEACTIVATED); diff --git a/src/server/scripts/Northrend/grizzly_hills.cpp b/src/server/scripts/Northrend/grizzly_hills.cpp index fa08e8cafb4..1678e36b1a8 100644 --- a/src/server/scripts/Northrend/grizzly_hills.cpp +++ b/src/server/scripts/Northrend/grizzly_hills.cpp @@ -367,7 +367,7 @@ public: void EnterEvadeMode() {} - void MoveInLineOfSight(Unit * /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} void UpdateAI(const uint32 /*diff*/) { @@ -675,7 +675,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit * pKiller) + void JustDied(Unit* pKiller) { if (pKiller->ToPlayer() && pKiller->ToPlayer()->GetTypeId() == TYPEID_PLAYER) { diff --git a/src/server/scripts/Northrend/sholazar_basin.cpp b/src/server/scripts/Northrend/sholazar_basin.cpp index aa4d10ae980..255a1779ff7 100644 --- a/src/server/scripts/Northrend/sholazar_basin.cpp +++ b/src/server/scripts/Northrend/sholazar_basin.cpp @@ -155,7 +155,7 @@ public: return true; } - bool OnQuestAccept(Player* /*pPlayer*/, Creature* pCreature, Quest const * /*_Quest*/) + bool OnQuestAccept(Player* /*pPlayer*/, Creature* pCreature, Quest const* /*_Quest*/) { DoScriptText(SAY_QUEST_ACCEPT_IRO, pCreature); return false; diff --git a/src/server/scripts/Northrend/zuldrak.cpp b/src/server/scripts/Northrend/zuldrak.cpp index befe34faeed..eab88800203 100644 --- a/src/server/scripts/Northrend/zuldrak.cpp +++ b/src/server/scripts/Northrend/zuldrak.cpp @@ -144,7 +144,7 @@ public: DoCast(me, SPELL_KNEEL, true); // Little Hack for kneel - Thanks Illy :P } - void MoveInLineOfSight(Unit * /*who*/){} + void MoveInLineOfSight(Unit* /*who*/){} void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell) { diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp index 1a69c6a828d..ad39be101ac 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp @@ -302,7 +302,7 @@ void OPvPCapturePointEP_NPT::SummonGO(uint32 team) m_SummonedGOSide = team; DelObject(EP_NPT_BUFF); AddObject(EP_NPT_BUFF, EP_NPT_LordaeronShrine.entry, EP_NPT_LordaeronShrine.map, EP_NPT_LordaeronShrine.x, EP_NPT_LordaeronShrine.y, EP_NPT_LordaeronShrine.z, EP_NPT_LordaeronShrine.o, EP_NPT_LordaeronShrine.rot0, EP_NPT_LordaeronShrine.rot1, EP_NPT_LordaeronShrine.rot2, EP_NPT_LordaeronShrine.rot3); - GameObject * go = HashMapHolder<GameObject>::Find(m_Objects[EP_NPT_BUFF]); + GameObject* go = HashMapHolder<GameObject>::Find(m_Objects[EP_NPT_BUFF]); if (go) go->SetUInt32Value(GAMEOBJECT_FACTION, (team == ALLIANCE ? 84 : 83)); } @@ -576,7 +576,7 @@ void OPvPCapturePointEP_PWT::SummonFlightMaster(uint32 team) /* // sky - we need update gso code - Creature * c = HashMapHolder<Creature>::Find(m_Creatures[EP_PWT_FLIGHTMASTER]); + Creature* c = HashMapHolder<Creature>::Find(m_Creatures[EP_PWT_FLIGHTMASTER]); //Spawn flight master as friendly to capturing team c->SetUInt32Value(GAMEOBJECT_FACTION, (team == ALLIANCE ? 55 : 68)); if(c) @@ -658,7 +658,7 @@ bool OutdoorPvPEP::Update(uint32 diff) return false; } -void OutdoorPvPEP::HandlePlayerEnterZone(Player * plr, uint32 zone) +void OutdoorPvPEP::HandlePlayerEnterZone(Player* plr, uint32 zone) { // add buffs if (plr->GetTeam() == ALLIANCE) @@ -674,7 +674,7 @@ void OutdoorPvPEP::HandlePlayerEnterZone(Player * plr, uint32 zone) OutdoorPvP::HandlePlayerEnterZone(plr, zone); } -void OutdoorPvPEP::HandlePlayerLeaveZone(Player * plr, uint32 zone) +void OutdoorPvPEP::HandlePlayerLeaveZone(Player* plr, uint32 zone) { // remove buffs if (plr->GetTeam() == ALLIANCE) @@ -694,7 +694,7 @@ void OutdoorPvPEP::BuffTeams() { for (PlayerSet::iterator itr = m_players[0].begin(); itr != m_players[0].end(); ++itr) { - Player * plr = *itr; + Player* plr = *itr; { for (int i = 0; i < 4; ++i) plr->RemoveAurasDueToSpell(EP_AllianceBuffs[i]); @@ -704,7 +704,7 @@ void OutdoorPvPEP::BuffTeams() } for (PlayerSet::iterator itr = m_players[1].begin(); itr != m_players[1].end(); ++itr) { - Player * plr = *itr; + Player* plr = *itr; { for (int i = 0; i < 4; ++i) plr->RemoveAurasDueToSpell(EP_HordeBuffs[i]); diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPEP.h b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.h index 6ce4cd1bcb2..b0a3f744c3d 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPEP.h +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.h @@ -197,8 +197,8 @@ class OPvPCapturePointEP_EWT : public OPvPCapturePoint void FillInitialWorldStates(WorldPacket & data); // used when player is activated/inactivated in the area - bool HandlePlayerEnter(Player * plr); - void HandlePlayerLeave(Player * plr); + bool HandlePlayerEnter(Player* plr); + void HandlePlayerLeave(Player* plr); protected: @@ -228,8 +228,8 @@ class OPvPCapturePointEP_NPT : public OPvPCapturePoint void FillInitialWorldStates(WorldPacket & data); // used when player is activated/inactivated in the area - bool HandlePlayerEnter(Player * plr); - void HandlePlayerLeave(Player * plr); + bool HandlePlayerEnter(Player* plr); + void HandlePlayerLeave(Player* plr); protected: @@ -259,8 +259,8 @@ class OPvPCapturePointEP_CGT : public OPvPCapturePoint void FillInitialWorldStates(WorldPacket & data); // used when player is activated/inactivated in the area - bool HandlePlayerEnter(Player * plr); - void HandlePlayerLeave(Player * plr); + bool HandlePlayerEnter(Player* plr); + void HandlePlayerLeave(Player* plr); protected: @@ -290,8 +290,8 @@ class OPvPCapturePointEP_PWT : public OPvPCapturePoint void FillInitialWorldStates(WorldPacket & data); // used when player is activated/inactivated in the area - bool HandlePlayerEnter(Player * plr); - void HandlePlayerLeave(Player * plr); + bool HandlePlayerEnter(Player* plr); + void HandlePlayerLeave(Player* plr); protected: @@ -326,7 +326,7 @@ class OutdoorPvPEP : public OutdoorPvP void FillInitialWorldStates(WorldPacket &data); - void SendRemoveWorldStates(Player * plr); + void SendRemoveWorldStates(Player* plr); void BuffTeams(); diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp index 7a4e3b2abaf..cf754e528a4 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp @@ -81,7 +81,7 @@ bool OutdoorPvPHP::SetupOutdoorPvP() return true; } -void OutdoorPvPHP::HandlePlayerEnterZone(Player * plr, uint32 zone) +void OutdoorPvPHP::HandlePlayerEnterZone(Player* plr, uint32 zone) { // add buffs if (plr->GetTeam() == ALLIANCE) @@ -97,7 +97,7 @@ void OutdoorPvPHP::HandlePlayerEnterZone(Player * plr, uint32 zone) OutdoorPvP::HandlePlayerEnterZone(plr, zone); } -void OutdoorPvPHP::HandlePlayerLeaveZone(Player * plr, uint32 zone) +void OutdoorPvPHP::HandlePlayerLeaveZone(Player* plr, uint32 zone) { // remove buffs if (plr->GetTeam() == ALLIANCE) @@ -320,7 +320,7 @@ void OPvPCapturePointHP::HandlePlayerLeave(Player *plr) OPvPCapturePoint::HandlePlayerLeave(plr); } -void OutdoorPvPHP::HandleKillImpl(Player *plr, Unit * killed) +void OutdoorPvPHP::HandleKillImpl(Player *plr, Unit* killed) { if (killed->GetTypeId() != TYPEID_PLAYER) return; diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.h b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.h index e53a3537b83..42c62c2584b 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.h +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.h @@ -98,8 +98,8 @@ class OPvPCapturePointHP : public OPvPCapturePoint void FillInitialWorldStates(WorldPacket & data); // used when player is activated/inactivated in the area - bool HandlePlayerEnter(Player * plr); - void HandlePlayerLeave(Player * plr); + bool HandlePlayerEnter(Player* plr); + void HandlePlayerLeave(Player* plr); private: @@ -123,9 +123,9 @@ class OutdoorPvPHP : public OutdoorPvP void FillInitialWorldStates(WorldPacket &data); - void SendRemoveWorldStates(Player * plr); + void SendRemoveWorldStates(Player* plr); - void HandleKillImpl(Player * plr, Unit * killed); + void HandleKillImpl(Player* plr, Unit* killed); private: diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp index a015de48f88..bff1e8e011d 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp @@ -29,7 +29,7 @@ OutdoorPvPNA::OutdoorPvPNA() m_TypeId = OUTDOOR_PVP_NA; } -void OutdoorPvPNA::HandleKillImpl(Player *plr, Unit * killed) +void OutdoorPvPNA::HandleKillImpl(Player *plr, Unit* killed) { if (killed->GetTypeId() == TYPEID_PLAYER && plr->GetTeam() != killed->ToPlayer()->GetTeam()) { @@ -64,12 +64,12 @@ uint32 OPvPCapturePointNA::GetAliveGuardsCount() case NA_NPC_GUARD_14: case NA_NPC_GUARD_15: { - if (Creature * cr = HashMapHolder<Creature>::Find(itr->second)) + if (Creature* cr = HashMapHolder<Creature>::Find(itr->second)) { if (cr->isAlive()) ++cnt; } - else if (CreatureData const * cd = sObjectMgr->GetCreatureData(GUID_LOPART(itr->second))) + else if (CreatureData const* cd = sObjectMgr->GetCreatureData(GUID_LOPART(itr->second))) { if (!cd->is_dead) ++cnt; @@ -225,7 +225,7 @@ bool OutdoorPvPNA::SetupOutdoorPvP() return true; } -void OutdoorPvPNA::HandlePlayerEnterZone(Player * plr, uint32 zone) +void OutdoorPvPNA::HandlePlayerEnterZone(Player* plr, uint32 zone) { // add buffs if (plr->GetTeam() == m_obj->m_ControllingFaction) @@ -233,7 +233,7 @@ void OutdoorPvPNA::HandlePlayerEnterZone(Player * plr, uint32 zone) OutdoorPvP::HandlePlayerEnterZone(plr, zone); } -void OutdoorPvPNA::HandlePlayerLeaveZone(Player * plr, uint32 zone) +void OutdoorPvPNA::HandlePlayerLeaveZone(Player* plr, uint32 zone) { // remove buffs plr->RemoveAurasDueToSpell(NA_CAPTURE_BUFF); @@ -334,7 +334,7 @@ bool OutdoorPvPNA::Update(uint32 diff) return m_obj->Update(diff); } -bool OPvPCapturePointNA::HandleCustomSpell(Player * plr, uint32 spellId, GameObject * /*go*/) +bool OPvPCapturePointNA::HandleCustomSpell(Player* plr, uint32 spellId, GameObject* /*go*/) { std::vector<uint32> nodes; nodes.resize(2); diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h index eba273245eb..8a50ef65ba1 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h @@ -267,10 +267,10 @@ class OPvPCapturePointNA : public OPvPCapturePoint void FillInitialWorldStates(WorldPacket & data); // used when player is activated/inactivated in the area - bool HandlePlayerEnter(Player * plr); - void HandlePlayerLeave(Player * plr); + bool HandlePlayerEnter(Player* plr); + void HandlePlayerLeave(Player* plr); - bool HandleCustomSpell(Player *plr, uint32 spellId, GameObject * go); + bool HandleCustomSpell(Player *plr, uint32 spellId, GameObject* go); int32 HandleOpenGo(Player *plr, uint64 guid); @@ -327,9 +327,9 @@ class OutdoorPvPNA : public OutdoorPvP void FillInitialWorldStates(WorldPacket &data); - void SendRemoveWorldStates(Player * plr); + void SendRemoveWorldStates(Player* plr); - void HandleKillImpl(Player * plr, Unit * killed); + void HandleKillImpl(Player* plr, Unit* killed); private: diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp index ab336e3b2ba..627bb28b0e7 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp @@ -67,14 +67,14 @@ bool OutdoorPvPSI::Update(uint32 /*diff*/) return false; } -void OutdoorPvPSI::HandlePlayerEnterZone(Player * plr, uint32 zone) +void OutdoorPvPSI::HandlePlayerEnterZone(Player* plr, uint32 zone) { if (plr->GetTeam() == m_LastController) plr->CastSpell(plr, SI_CENARION_FAVOR, true); OutdoorPvP::HandlePlayerEnterZone(plr, zone); } -void OutdoorPvPSI::HandlePlayerLeaveZone(Player * plr, uint32 zone) +void OutdoorPvPSI::HandlePlayerLeaveZone(Player* plr, uint32 zone) { // remove buffs plr->RemoveAurasDueToSpell(SI_CENARION_FAVOR); @@ -155,7 +155,7 @@ bool OutdoorPvPSI::HandleDropFlag(Player *plr, uint32 spellId) if (plr->GetDistance(atEntry->x, atEntry->y, atEntry->z) > 5.0f + atEntry->radius) { // he dropped it further, summon mound - GameObject * go = new GameObject; + GameObject* go = new GameObject; Map * map = plr->GetMap(); if (!map) { @@ -185,7 +185,7 @@ bool OutdoorPvPSI::HandleDropFlag(Player *plr, uint32 spellId) if (plr->GetDistance(atEntry->x, atEntry->y, atEntry->z) > 5.0f + atEntry->radius) { // he dropped it further, summon mound - GameObject * go = new GameObject; + GameObject* go = new GameObject; Map * map = plr->GetMap(); if (!map) { diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.h b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.h index 0acec8c3213..b93a0f2a5a5 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.h +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.h @@ -66,13 +66,13 @@ class OutdoorPvPSI : public OutdoorPvP void FillInitialWorldStates(WorldPacket &data); - void SendRemoveWorldStates(Player * plr); + void SendRemoveWorldStates(Player* plr); - bool HandleAreaTrigger(Player * plr, uint32 trigger); + bool HandleAreaTrigger(Player* plr, uint32 trigger); - bool HandleDropFlag(Player * plr, uint32 spellId); + bool HandleDropFlag(Player* plr, uint32 spellId); - bool HandleCustomSpell(Player * plr, uint32 spellId, GameObject *go); + bool HandleCustomSpell(Player* plr, uint32 spellId, GameObject *go); void UpdateWorldState(); diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp index ffcbfd7997e..a4fc38e7e80 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp @@ -67,7 +67,7 @@ void OutdoorPvPTF::FillInitialWorldStates(WorldPacket &data) } } -void OutdoorPvPTF::SendRemoveWorldStates(Player * plr) +void OutdoorPvPTF::SendRemoveWorldStates(Player* plr) { plr->SendUpdateWorldState(TF_UI_TOWER_SLIDER_POS, uint32(0)); plr->SendUpdateWorldState(TF_UI_TOWER_SLIDER_N, uint32(0)); @@ -186,7 +186,7 @@ bool OutdoorPvPTF::Update(uint32 diff) return changed; } -void OutdoorPvPTF::HandlePlayerEnterZone(Player * plr, uint32 zone) +void OutdoorPvPTF::HandlePlayerEnterZone(Player* plr, uint32 zone) { if (plr->GetTeam() == ALLIANCE) { @@ -201,7 +201,7 @@ void OutdoorPvPTF::HandlePlayerEnterZone(Player * plr, uint32 zone) OutdoorPvP::HandlePlayerEnterZone(plr, zone); } -void OutdoorPvPTF::HandlePlayerLeaveZone(Player * plr, uint32 zone) +void OutdoorPvPTF::HandlePlayerLeaveZone(Player* plr, uint32 zone) { // remove buffs plr->RemoveAurasDueToSpell(TF_CAPTURE_BUFF); diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.h b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.h index e42dd54777f..f04faf81fd8 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.h +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.h @@ -136,8 +136,8 @@ class OPvPCapturePointTF : public OPvPCapturePoint void FillInitialWorldStates(WorldPacket & data); // used when player is activated/inactivated in the area - bool HandlePlayerEnter(Player * plr); - void HandlePlayerLeave(Player * plr); + bool HandlePlayerEnter(Player* plr); + void HandlePlayerLeave(Player* plr); void UpdateTowerState(); @@ -165,7 +165,7 @@ class OutdoorPvPTF : public OutdoorPvP void FillInitialWorldStates(WorldPacket &data); - void SendRemoveWorldStates(Player * plr); + void SendRemoveWorldStates(Player* plr); private: diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp index 1bcb18821b4..4fdc22f04b3 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp @@ -139,7 +139,7 @@ bool OutdoorPvPZM::Update(uint32 diff) return changed; } -void OutdoorPvPZM::HandlePlayerEnterZone(Player * plr, uint32 zone) +void OutdoorPvPZM::HandlePlayerEnterZone(Player* plr, uint32 zone) { if (plr->GetTeam() == ALLIANCE) { @@ -154,7 +154,7 @@ void OutdoorPvPZM::HandlePlayerEnterZone(Player * plr, uint32 zone) OutdoorPvP::HandlePlayerEnterZone(plr, zone); } -void OutdoorPvPZM::HandlePlayerLeaveZone(Player * plr, uint32 zone) +void OutdoorPvPZM::HandlePlayerLeaveZone(Player* plr, uint32 zone) { // remove buffs plr->RemoveAurasDueToSpell(ZM_CAPTURE_BUFF); @@ -190,7 +190,7 @@ bool OutdoorPvPZM::SetupOutdoorPvP() return true; } -void OutdoorPvPZM::HandleKillImpl(Player *plr, Unit * killed) +void OutdoorPvPZM::HandleKillImpl(Player *plr, Unit* killed) { if (killed->GetTypeId() != TYPEID_PLAYER) return; @@ -311,7 +311,7 @@ void OPvPCapturePointZM_GraveYard::SetBeaconState(uint32 controlling_faction) if (m_FlagCarrierGUID) { // remove flag from carrier, reset flag carrier guid - Player * p = sObjectMgr->GetPlayer(m_FlagCarrierGUID); + Player* p = sObjectMgr->GetPlayer(m_FlagCarrierGUID); if (p) { p->RemoveAurasDueToSpell(ZM_BATTLE_STANDARD_A); @@ -326,7 +326,7 @@ void OPvPCapturePointZM_GraveYard::SetBeaconState(uint32 controlling_faction) UpdateTowerState(); } -bool OPvPCapturePointZM_GraveYard::CanTalkTo(Player * plr, Creature * c, GossipMenuItems const& /*gso*/) +bool OPvPCapturePointZM_GraveYard::CanTalkTo(Player* plr, Creature* c, GossipMenuItems const& /*gso*/) { uint64 guid = c->GetGUID(); std::map<uint64, uint32>::iterator itr = m_CreatureTypes.find(guid); @@ -345,7 +345,7 @@ bool OPvPCapturePointZM_GraveYard::HandleGossipOption(Player *plr, uint64 guid, std::map<uint64, uint32>::iterator itr = m_CreatureTypes.find(guid); if (itr != m_CreatureTypes.end()) { - Creature * cr = HashMapHolder<Creature>::Find(guid); + Creature* cr = HashMapHolder<Creature>::Find(guid); if (!cr) return true; // if the flag is already taken, then return @@ -368,7 +368,7 @@ bool OPvPCapturePointZM_GraveYard::HandleGossipOption(Player *plr, uint64 guid, return false; } -bool OPvPCapturePointZM_GraveYard::HandleDropFlag(Player * /*plr*/, uint32 spellId) +bool OPvPCapturePointZM_GraveYard::HandleDropFlag(Player* /*plr*/, uint32 spellId) { switch(spellId) { diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h index a1ac4d4bbda..5cd2afde243 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h @@ -181,8 +181,8 @@ class OPvPCapturePointZM_Beacon : public OPvPCapturePoint void FillInitialWorldStates(WorldPacket & data); // used when player is activated/inactivated in the area - bool HandlePlayerEnter(Player * plr); - void HandlePlayerLeave(Player * plr); + bool HandlePlayerEnter(Player* plr); + void HandlePlayerLeave(Player* plr); void UpdateTowerState(); @@ -219,11 +219,11 @@ class OPvPCapturePointZM_GraveYard : public OPvPCapturePoint void SetBeaconState(uint32 controlling_team); // not good atm - bool HandleGossipOption(Player * plr, uint64 guid, uint32 gossipid); + bool HandleGossipOption(Player* plr, uint64 guid, uint32 gossipid); - bool HandleDropFlag(Player * plr, uint32 spellId); + bool HandleDropFlag(Player* plr, uint32 spellId); - bool CanTalkTo(Player * plr, Creature * c, GossipMenuItems const& gso); + bool CanTalkTo(Player* plr, Creature* c, GossipMenuItems const& gso); private: @@ -253,9 +253,9 @@ class OutdoorPvPZM : public OutdoorPvP void FillInitialWorldStates(WorldPacket &data); - void SendRemoveWorldStates(Player * plr); + void SendRemoveWorldStates(Player* plr); - void HandleKillImpl(Player * plr, Unit * killed); + void HandleKillImpl(Player* plr, Unit* killed); private: diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp index 285a7e6ed81..378a60fbefa 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp @@ -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*/) { } diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp index 5371d8493e3..6aeb4bfc02f 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp @@ -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) diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp index 42256b6a501..7d5c64ca182 100644 --- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp +++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp @@ -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); diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp index 586a8dcc96d..e79d712aef4 100644 --- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp +++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp @@ -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); } diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp index 5bafe396b0d..c0fd4433b16 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp @@ -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) { diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp index c7ea5523dac..2dec3658b39 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp @@ -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); } diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp index 6be6824953c..40db25798b3 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp @@ -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); diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp index 17174439e58..1fbf91e8598 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp @@ -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); diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp index c7954000934..70439bf9027 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp @@ -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(); diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp index 58859e0230d..a220531a929 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp @@ -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) diff --git a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp index d8c389eef1a..6bec350adfc 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp @@ -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); diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp index d357faee386..dad131eb6f5 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp @@ -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 diff --git a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp index 6eb6bb620c8..309b1884685 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp @@ -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); diff --git a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp index ae4d9790fca..4e545087303 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp @@ -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); } diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp index 3a8f367bd43..e0b732b42c3 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp @@ -289,7 +289,7 @@ public: summons.Despawn(summon); } - void MoveInLineOfSight(Unit * /*who*/) + void MoveInLineOfSight(Unit* /*who*/) { if (!GridSearcherSucceeded) { diff --git a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp index fd741088ecc..49eaeea2767 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp @@ -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*/) { diff --git a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp index 4153c4c234f..c5491ed2d0c 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp @@ -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); diff --git a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp index fb8711ec7ac..e3c59203903 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp @@ -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); diff --git a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp index 0ae6d62e175..fc3ac269260 100644 --- a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp +++ b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp @@ -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; diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp index b5e0120d004..499652f6034 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp @@ -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) { diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp index 9c79808b589..520a22e414d 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp @@ -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); diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp index f9879dee03a..45b8b5d3590 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp @@ -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) { diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp index d8e3b1158e9..f69a8cc7589 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp @@ -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*/) {} }; }; diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp index 67cb8797593..51327f5d985 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp @@ -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*/) { } diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp index 62b41cd4c0f..ce80a1b3ee7 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp @@ -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) { diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp index dcc88ba5d78..e84ced2db5a 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp @@ -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) { diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp index 6781e3562c2..4129438f140 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp @@ -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) { diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp index d91750beaa3..ffe7265a566 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp @@ -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) diff --git a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp index 6ccce4646ba..d9a8b629d68 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp @@ -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*/) {} diff --git a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp index d77cdcf69f0..00559eeec99 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp @@ -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)) diff --git a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp index dad5f356a1c..67dfd42815b 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp @@ -96,7 +96,7 @@ public: pInstance->SetData(DATA_GRUULEVENT, NOT_STARTED); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); diff --git a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp index 4d835a680c0..b1b19898161 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp @@ -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) { diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp index a21ce8473b7..f07f559df8e 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp @@ -71,7 +71,7 @@ class boss_broggok : public CreatureScript } } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); if (pInstance) diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp index 7f2b5f7bd78..2c559c9bf34 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp @@ -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); diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp index 6afbe18a78e..85f8c394fb2 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp @@ -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); } diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp index 6622c42827b..a8fe1458cf9 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp @@ -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); } diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp index f1b21b1da69..c8163e19da5 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp @@ -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); } diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp index d58cb83ce92..793d49e8cae 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp @@ -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(); diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp index 71c05cbf93a..b29d41070bc 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp @@ -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*/) {} }; diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp index 69e8c12ac41..44397fe4299 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp @@ -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); diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp index 417eb865b4d..018aefaa3d1 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp @@ -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); } diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp index 7eef901f83e..8fa39447198 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp @@ -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*/) {} diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp index d50ac198eff..e894cd2be78 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp @@ -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*/) { } diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp index 95e6a52db2b..5c4f3cb959a 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp @@ -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) { diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp index 988524b35f3..e348ac5aab4 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp @@ -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); diff --git a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp index a0b954870df..12f95fdb4aa 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp @@ -57,7 +57,7 @@ class mob_crystalcore_devastator : public CreatureScript Knockaway_Timer = 25000; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp index 2b575d2b499..b81b74a7fa9 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp @@ -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); } diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp index ecaf72d8567..f4eacb9bf3c 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp @@ -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); } diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp index c67e70a8614..57d9cacd5a6 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp @@ -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); diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp index 040b1469130..75a1d3b51a0 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp @@ -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 diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp index 4d031be1195..56377818eae 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp @@ -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); } diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp index eaaaaec92cd..6e2ba1ad4d7 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp @@ -155,7 +155,7 @@ class boss_laj : public CreatureScript CanSummon = false; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp index ac69e21a30b..2fccfd0eddc 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp @@ -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); } diff --git a/src/server/scripts/Outland/nagrand.cpp b/src/server/scripts/Outland/nagrand.cpp index 54ff410a2ca..e7f1f01b670 100644 --- a/src/server/scripts/Outland/nagrand.cpp +++ b/src/server/scripts/Outland/nagrand.cpp @@ -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 { diff --git a/src/server/scripts/Outland/netherstorm.cpp b/src/server/scripts/Outland/netherstorm.cpp index 6bd250dd171..3e801bd1eed 100644 --- a/src/server/scripts/Outland/netherstorm.cpp +++ b/src/server/scripts/Outland/netherstorm.cpp @@ -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); } diff --git a/src/server/scripts/Outland/shadowmoon_valley.cpp b/src/server/scripts/Outland/shadowmoon_valley.cpp index 8eda56d77e1..7b571c5874c 100644 --- a/src/server/scripts/Outland/shadowmoon_valley.cpp +++ b/src/server/scripts/Outland/shadowmoon_valley.cpp @@ -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*/) { diff --git a/src/server/scripts/Outland/terokkar_forest.cpp b/src/server/scripts/Outland/terokkar_forest.cpp index 0bf7e99ad80..92765ec61de 100644 --- a/src/server/scripts/Outland/terokkar_forest.cpp +++ b/src/server/scripts/Outland/terokkar_forest.cpp @@ -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) { diff --git a/src/server/scripts/Outland/zangarmarsh.cpp b/src/server/scripts/Outland/zangarmarsh.cpp index 32095a26140..3c2f4c991ee 100644 --- a/src/server/scripts/Outland/zangarmarsh.cpp +++ b/src/server/scripts/Outland/zangarmarsh.cpp @@ -164,7 +164,7 @@ public: me->setFaction(m_uiNormFaction); } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { diff --git a/src/server/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp index 80ee96a7578..f6492c9dee7 100644 --- a/src/server/scripts/Spells/spell_dk.cpp +++ b/src/server/scripts/Spells/spell_dk.cpp @@ -55,7 +55,7 @@ class spell_dk_anti_magic_shell_raid : public SpellScriptLoader return true; } - void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/) + void CalculateAmount(AuraEffect const* /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/) { // TODO: this should absorb limited amount of damage, but no info on calculation formula amount = -1; @@ -97,12 +97,12 @@ class spell_dk_anti_magic_shell_self : public SpellScriptLoader return true; } - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { return sSpellStore.LookupEntry(DK_SPELL_RUNIC_POWER_ENERGIZE); } - void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/) + void CalculateAmount(AuraEffect const* /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/) { // Set absorbtion amount to unlimited amount = -1; @@ -115,7 +115,7 @@ class spell_dk_anti_magic_shell_self : public SpellScriptLoader void Trigger(AuraEffect * aurEff, DamageInfo & /*dmgInfo*/, uint32 & absorbAmount) { - Unit * target = GetTarget(); + Unit* target = GetTarget(); // damage absorbed by Anti-Magic Shell energizes the DK with additional runic power. // This, if I'm not mistaken, shows that we get back ~20% of the absorbed damage as runic power. int32 bp = absorbAmount * 2 / 10; @@ -154,17 +154,17 @@ class spell_dk_anti_magic_zone : public SpellScriptLoader return true; } - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { return sSpellStore.LookupEntry(DK_SPELL_ANTI_MAGIC_SHELL_TALENT); } - void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/) + void CalculateAmount(AuraEffect const* /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/) { - SpellEntry const * talentSpell = sSpellStore.LookupEntry(DK_SPELL_ANTI_MAGIC_SHELL_TALENT); + SpellEntry const* talentSpell = sSpellStore.LookupEntry(DK_SPELL_ANTI_MAGIC_SHELL_TALENT); amount = SpellMgr::CalculateSpellEffectAmount(talentSpell, EFFECT_0, GetCaster()); // assume caster is a player here - if (Unit * caster = GetCaster()) + if (Unit* caster = GetCaster()) amount += int32(2 * caster->ToPlayer()->GetTotalAttackPowerValue(BASE_ATTACK)); } @@ -196,7 +196,7 @@ class spell_dk_corpse_explosion : public SpellScriptLoader { PrepareSpellScript(spell_dk_corpse_explosion_SpellScript); - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(DK_SPELL_CORPSE_EXPLOSION_TRIGGERED)) return false; @@ -370,7 +370,7 @@ class spell_dk_scourge_strike : public SpellScriptLoader { PrepareSpellScript(spell_dk_scourge_strike_SpellScript); - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(DK_SPELL_SCOURGE_STRIKE_TRIGGERED)) return false; @@ -417,7 +417,7 @@ class spell_dk_spell_deflection : public SpellScriptLoader return true; } - void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/) + void CalculateAmount(AuraEffect const* /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/) { // Set absorbtion amount to unlimited amount = -1; @@ -453,7 +453,7 @@ class spell_dk_blood_boil : public SpellScriptLoader { PrepareSpellScript(spell_dk_blood_boil_SpellScript); - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(DK_SPELL_BLOOD_BOIL_TRIGGERED)) return false; @@ -520,7 +520,7 @@ class spell_dk_will_of_the_necropolis : public SpellScriptLoader return true; } - void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/) + void CalculateAmount(AuraEffect const* /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/) { // Set absorbtion amount to unlimited amount = -1; @@ -530,7 +530,7 @@ class spell_dk_will_of_the_necropolis : public SpellScriptLoader { // min pct of hp is stored in effect 0 of talent spell uint32 rank = sSpellMgr->GetSpellRank(GetSpellProto()->Id); - SpellEntry const * talentProto = sSpellStore.LookupEntry(sSpellMgr->GetSpellWithRank(DK_SPELL_WILL_OF_THE_NECROPOLIS_TALENT_R1, rank)); + SpellEntry const* talentProto = sSpellStore.LookupEntry(sSpellMgr->GetSpellWithRank(DK_SPELL_WILL_OF_THE_NECROPOLIS_TALENT_R1, rank)); int32 remainingHp = int32(GetTarget()->GetHealth() - dmgInfo.GetDamage()); int32 minHp = int32(GetTarget()->CountPctFromMaxHealth(SpellMgr::CalculateSpellEffectAmount(talentProto, EFFECT_0, GetCaster()))); diff --git a/src/server/scripts/Spells/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp index c2805715afa..1166ccdebb0 100644 --- a/src/server/scripts/Spells/spell_druid.cpp +++ b/src/server/scripts/Spells/spell_druid.cpp @@ -40,7 +40,7 @@ class spell_dru_glyph_of_starfire : public SpellScriptLoader { PrepareSpellScript(spell_dru_glyph_of_starfire_SpellScript); - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(DRUID_INCREASED_MOONFIRE_DURATION)) return false; @@ -53,7 +53,7 @@ class spell_dru_glyph_of_starfire : public SpellScriptLoader { Unit* caster = GetCaster(); if (Unit* unitTarget = GetHitUnit()) - if (AuraEffect const * aurEff = unitTarget->GetAuraEffect(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_DRUID, 0x00000002, 0, 0, caster->GetGUID())) + if (AuraEffect const* aurEff = unitTarget->GetAuraEffect(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_DRUID, 0x00000002, 0, 0, caster->GetGUID())) { Aura* aura = aurEff->GetBase(); @@ -102,7 +102,7 @@ class spell_dru_moonkin_form_passive : public SpellScriptLoader return true; } - void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/) + void CalculateAmount(AuraEffect const* /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/) { // Set absorbtion amount to unlimited amount = -1; @@ -146,7 +146,7 @@ class spell_dru_primal_tenacity : public SpellScriptLoader return true; } - void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/) + void CalculateAmount(AuraEffect const* /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/) { // Set absorbtion amount to unlimited amount = -1; @@ -190,7 +190,7 @@ class spell_dru_savage_defense : public SpellScriptLoader return true; } - void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/) + void CalculateAmount(AuraEffect const* /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/) { // Set absorbtion amount to unlimited amount = -1; diff --git a/src/server/scripts/Spells/spell_hunter.cpp b/src/server/scripts/Spells/spell_hunter.cpp index 0b27375fcf3..d809df9f449 100644 --- a/src/server/scripts/Spells/spell_hunter.cpp +++ b/src/server/scripts/Spells/spell_hunter.cpp @@ -49,7 +49,7 @@ public: class spell_hun_chimera_shot_SpellScript : public SpellScript { PrepareSpellScript(spell_hun_chimera_shot_SpellScript) - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(HUNTER_SPELL_CHIMERA_SHOT_SERPENT)) return false; @@ -80,7 +80,7 @@ public: flag96 familyFlag = aura->GetSpellProto()->SpellFamilyFlags; if (!(familyFlag[1] & 0x00000080 || familyFlag[0] & 0x0000C000)) continue; - if (AuraEffect const * aurEff = aura->GetEffect(0)) + if (AuraEffect const* aurEff = aura->GetEffect(0)) { // Serpent Sting - Instantly deals 40% of the damage done by your Serpent Sting. if (familyFlag[0] & 0x4000) @@ -145,7 +145,7 @@ public: class spell_hun_invigoration_SpellScript : public SpellScript { PrepareSpellScript(spell_hun_invigoration_SpellScript) - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(HUNTER_SPELL_INVIGORATION_TRIGGERED)) return false; @@ -180,7 +180,7 @@ public: class spell_hun_last_stand_pet_SpellScript : public SpellScript { PrepareSpellScript(spell_hun_last_stand_pet_SpellScript) - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(HUNTER_PET_SPELL_LAST_STAND_TRIGGERED)) return false; @@ -215,7 +215,7 @@ public: class spell_hun_masters_call_SpellScript : public SpellScript { PrepareSpellScript(spell_hun_masters_call_SpellScript) - bool Validate(SpellEntry const * spellEntry) + bool Validate(SpellEntry const* spellEntry) { if (!sSpellStore.LookupEntry(HUNTER_SPELL_MASTERS_CALL_TRIGGERED)) return false; @@ -228,14 +228,14 @@ public: void HandleScriptEffect(SpellEffIndex /*effIndex*/) { - if (Unit * target = GetHitUnit()) + if (Unit* target = GetHitUnit()) { target->CastSpell(target, GetEffectValue(), true); target->CastSpell(target, HUNTER_SPELL_MASTERS_CALL_TRIGGERED, true); // there is a possibility that this effect should access effect 0 (dummy) target, but i dubt that // it's more likely that on on retail it's possible to call target selector based on dbc values // anyways, we're using GetTargetUnit() here and it's ok - if (Unit * ally = GetTargetUnit()) + if (Unit* ally = GetTargetUnit()) { target->CastSpell(ally, GetEffectValue(), true); target->CastSpell(ally, SpellMgr::CalculateSpellEffectAmount(GetSpellInfo(), EFFECT_0), true); @@ -348,7 +348,7 @@ public: class spell_hun_sniper_training_AuraScript : public AuraScript { PrepareAuraScript(spell_hun_sniper_training_AuraScript) - bool Validate(SpellEntry const * /*entry*/) + bool Validate(SpellEntry const* /*entry*/) { if (!sSpellStore.LookupEntry(SPELL_SNIPER_TRAINING_R1)) return false; @@ -357,22 +357,22 @@ public: return true; } - void HandlePeriodic(AuraEffect const * aurEff) + void HandlePeriodic(AuraEffect const* aurEff) { PreventDefaultAction(); if (aurEff->GetAmount() > 0) return; - Unit * caster = GetCaster(); + Unit* caster = GetCaster(); if (!caster) return; uint32 spellId = SPELL_SNIPER_TRAINING_BUFF_R1 + GetId() - SPELL_SNIPER_TRAINING_R1; - Unit * pTarget = GetTarget(); + Unit* pTarget = GetTarget(); if (!pTarget->HasAura(spellId)) { - SpellEntry const * triggeredSpellInfo = sSpellStore.LookupEntry(spellId); + SpellEntry const* triggeredSpellInfo = sSpellStore.LookupEntry(spellId); Unit* triggerCaster = GetTriggeredSpellCaster(triggeredSpellInfo, caster, pTarget); triggerCaster->CastSpell(pTarget, triggeredSpellInfo, true, 0, aurEff); } @@ -380,7 +380,7 @@ public: void HandleUpdatePeriodic(AuraEffect * aurEff) { - Unit * pTarget = GetUnitOwner(); + Unit* pTarget = GetUnitOwner(); if (Player* pPlayerTarget = pTarget->ToPlayer()) { int32 baseAmount = aurEff->GetBaseAmount(); @@ -412,7 +412,7 @@ public: class spell_hun_pet_heart_of_the_phoenix_SpellScript : public SpellScript { PrepareSpellScript(spell_hun_pet_heart_of_the_phoenix_SpellScript) - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(HUNTER_PET_HEART_OF_THE_PHOENIX_TRIGGERED)) return false; @@ -459,7 +459,7 @@ public: class spell_hun_pet_carrion_feeder_SpellScript : public SpellScript { PrepareSpellScript(spell_hun_pet_carrion_feeder_SpellScript) - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(HUNTER_PET_SPELL_CARRION_FEEDER_TRIGGERED)) return false; diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index ef3409b8ab7..76ef4eb2ccc 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -42,7 +42,7 @@ public: public: spell_item_trigger_spell_SpellScript(uint32 triggeredSpellId) : SpellScript(), _triggeredSpellId(triggeredSpellId) { } - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(_triggeredSpellId)) return false; @@ -87,7 +87,7 @@ public: { PrepareSpellScript(spell_item_deviate_fish_SpellScript) public: - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { for (uint32 spellId = SPELL_SLEEPY; spellId <= SPELL_HEALTHY_SPIRIT; ++spellId) if (!sSpellStore.LookupEntry(spellId)) @@ -135,7 +135,7 @@ public: { public: PrepareSpellScript(spell_item_flask_of_the_north_SpellScript) - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(SPELL_FLASK_OF_THE_NORTH_SP)) return false; @@ -211,7 +211,7 @@ public: { public: PrepareSpellScript(spell_item_gnomish_death_ray_SpellScript) - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(SPELL_GNOMISH_DEATH_RAY_SELF)) return false; @@ -264,7 +264,7 @@ public: { public: PrepareSpellScript(spell_item_make_a_wish_SpellScript) - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(SPELL_MR_PINCHYS_BLESSING)) return false; @@ -381,7 +381,7 @@ public: { public: PrepareSpellScript(spell_item_net_o_matic_SpellScript) - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(SPELL_NET_O_MATIC_TRIGGERED1)) return false; @@ -437,7 +437,7 @@ public: { public: PrepareSpellScript(spell_item_noggenfogger_elixir_SpellScript) - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(SPELL_NOGGENFOGGER_ELIXIR_TRIGGERED1)) return false; @@ -495,7 +495,7 @@ public: { public: PrepareSpellScript(spell_item_savory_deviate_delight_SpellScript) - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { for (uint32 spellId = SPELL_FLIP_OUT_MALE; spellId <= SPELL_YAAARRRR_FEMALE; ++spellId) if (!sSpellStore.LookupEntry(spellId)) @@ -553,7 +553,7 @@ public: { public: PrepareSpellScript(spell_item_six_demon_bag_SpellScript) - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(SPELL_FROSTBOLT)) return false; @@ -632,7 +632,7 @@ public: { public: PrepareSpellScript(spell_item_underbelly_elixir_SpellScript) - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(SPELL_UNDERBELLY_ELIXIR_TRIGGERED1)) return false; diff --git a/src/server/scripts/Spells/spell_mage.cpp b/src/server/scripts/Spells/spell_mage.cpp index 7fee2db9aa1..95ed91f5a77 100644 --- a/src/server/scripts/Spells/spell_mage.cpp +++ b/src/server/scripts/Spells/spell_mage.cpp @@ -46,7 +46,7 @@ class spell_mage_blast_wave : public SpellScriptLoader class spell_mage_blast_wave_SpellScript : public SpellScript { PrepareSpellScript(spell_mage_blast_wave_SpellScript) - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(SPELL_MAGE_GLYPH_OF_BLAST_WAVE)) return false; @@ -126,7 +126,7 @@ class spell_mage_polymorph_cast_visual : public SpellScriptLoader PrepareSpellScript(spell_mage_polymorph_cast_visual_SpellScript) static const uint32 spell_list[6]; - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { // check if spell ids exist in dbc for (int i = 0; i < 6; i++) @@ -173,7 +173,7 @@ class spell_mage_summon_water_elemental : public SpellScriptLoader class spell_mage_summon_water_elemental_SpellScript : public SpellScript { PrepareSpellScript(spell_mage_summon_water_elemental_SpellScript) - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(SPELL_MAGE_GLYPH_OF_ETERNAL_WATER)) return false; @@ -225,7 +225,7 @@ public: SPELL_MAGE_FROST_WARDING_R1 = 28332, }; - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { return sSpellStore.LookupEntry(SPELL_MAGE_FROST_WARDING_TRIGGERED) && sSpellStore.LookupEntry(SPELL_MAGE_FROST_WARDING_R1); @@ -233,7 +233,7 @@ public: void Absorb(AuraEffect * aurEff, DamageInfo & dmgInfo, uint32 & absorbAmount) { - Unit * target = GetTarget(); + Unit* target = GetTarget(); if (AuraEffect * talentAurEff = target->GetAuraEffectOfRankedSpell(SPELL_MAGE_FROST_WARDING_R1, EFFECT_0)) { int32 chance = SpellMgr::CalculateSpellEffectAmount(talentAurEff->GetSpellProto(), EFFECT_1); @@ -268,7 +268,7 @@ public: SPELL_MAGE_INCANTERS_ABSORBTION_R1 = 44394, }; - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { return sSpellStore.LookupEntry(SPELL_MAGE_INCANTERS_ABSORBTION_TRIGGERED) && sSpellStore.LookupEntry(SPELL_MAGE_INCANTERS_ABSORBTION_R1); @@ -276,7 +276,7 @@ public: void Trigger(AuraEffect * aurEff, DamageInfo & /*dmgInfo*/, uint32 & absorbAmount) { - Unit * target = GetTarget(); + Unit* target = GetTarget(); if (AuraEffect * talentAurEff = target->GetAuraEffectOfRankedSpell(SPELL_MAGE_INCANTERS_ABSORBTION_R1, EFFECT_0)) { diff --git a/src/server/scripts/Spells/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp index fd37c258fc4..5902bc04885 100644 --- a/src/server/scripts/Spells/spell_paladin.cpp +++ b/src/server/scripts/Spells/spell_paladin.cpp @@ -63,7 +63,7 @@ public: return GetUnitOwner()->ToPlayer(); } - void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/) + void CalculateAmount(AuraEffect const* /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/) { // Set absorbtion amount to unlimited amount = -1; @@ -71,7 +71,7 @@ public: void Absorb(AuraEffect * aurEff, DamageInfo & dmgInfo, uint32 & absorbAmount) { - Unit * pVictim = GetTarget(); + Unit* pVictim = GetTarget(); int32 remainingHealth = pVictim->GetHealth() - dmgInfo.GetDamage(); uint32 allowedHealth = pVictim->CountPctFromMaxHealth(35); // If damage kills us @@ -123,7 +123,7 @@ public: class spell_pal_blessing_of_faith_SpellScript : public SpellScript { PrepareSpellScript(spell_pal_blessing_of_faith_SpellScript) - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(SPELL_BLESSING_OF_LOWER_CITY_DRUID)) return false; @@ -184,14 +184,14 @@ public: return true; } - void HandleEffectApply(AuraEffect const * /*aurEff*/, AuraEffectHandleModes /*mode*/) + void HandleEffectApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* pTarget = GetTarget(); if (Unit* pCaster = GetCaster()) pCaster->CastSpell(pTarget, PALADIN_SPELL_BLESSING_OF_SANCTUARY_BUFF, true); } - void HandleEffectRemove(AuraEffect const * /*aurEff*/, AuraEffectHandleModes /*mode*/) + void HandleEffectRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* pTarget = GetTarget(); pTarget->RemoveAura(PALADIN_SPELL_BLESSING_OF_SANCTUARY_BUFF, GetCasterGUID()); @@ -219,7 +219,7 @@ public: class spell_pal_guarded_by_the_light_SpellScript : public SpellScript { PrepareSpellScript(spell_pal_guarded_by_the_light_SpellScript) - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(PALADIN_SPELL_DIVINE_PLEA)) return false; diff --git a/src/server/scripts/Spells/spell_priest.cpp b/src/server/scripts/Spells/spell_priest.cpp index 98504899da5..d4b6c293af7 100644 --- a/src/server/scripts/Spells/spell_priest.cpp +++ b/src/server/scripts/Spells/spell_priest.cpp @@ -46,7 +46,7 @@ class spell_pri_guardian_spirit : public SpellScriptLoader uint32 healPct; - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { return sSpellStore.LookupEntry(PRIEST_SPELL_GUARDIAN_SPIRIT_HEAL) != NULL; } @@ -57,7 +57,7 @@ class spell_pri_guardian_spirit : public SpellScriptLoader return true; } - void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/) + void CalculateAmount(AuraEffect const* /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/) { // Set absorbtion amount to unlimited amount = -1; @@ -65,7 +65,7 @@ class spell_pri_guardian_spirit : public SpellScriptLoader void Absorb(AuraEffect * /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount) { - Unit * target = GetTarget(); + Unit* target = GetTarget(); if (dmgInfo.GetDamage() < target->GetHealth()) return; @@ -184,7 +184,7 @@ class spell_pri_penance : public SpellScriptLoader { PrepareSpellScript(spell_pri_penance_SpellScript); - bool Validate(SpellEntry const * spellEntry) + bool Validate(SpellEntry const* spellEntry) { if (!sSpellStore.LookupEntry(PRIEST_SPELL_PENANCE_R1)) return false; @@ -240,17 +240,17 @@ class spell_pri_reflective_shield_trigger : public SpellScriptLoader { PrepareAuraScript(spell_pri_reflective_shield_trigger_AuraScript); - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { return sSpellStore.LookupEntry(PRIEST_SPELL_REFLECTIVE_SHIELD_TRIGGERED) && sSpellStore.LookupEntry(PRIEST_SPELL_REFLECTIVE_SHIELD_R1); } void Trigger(AuraEffect * aurEff, DamageInfo & dmgInfo, uint32 & absorbAmount) { - Unit * target = GetTarget(); + Unit* target = GetTarget(); if (dmgInfo.GetAttacker() == target) return; - Unit * caster = GetCaster(); + Unit* caster = GetCaster(); if (!caster) return; if (AuraEffect * talentAurEff = target->GetAuraEffectOfRankedSpell(PRIEST_SPELL_REFLECTIVE_SHIELD_R1, EFFECT_0)) diff --git a/src/server/scripts/Spells/spell_quest.cpp b/src/server/scripts/Spells/spell_quest.cpp index 8c0f17d8d95..75cb838b1c0 100644 --- a/src/server/scripts/Spells/spell_quest.cpp +++ b/src/server/scripts/Spells/spell_quest.cpp @@ -94,7 +94,7 @@ public: class spell_q5206_test_fetid_skull_SpellScript : public SpellScript { PrepareSpellScript(spell_q5206_test_fetid_skull_SpellScript) - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(SPELL_CREATE_RESONATING_SKULL)) return false; @@ -219,14 +219,14 @@ public: class spell_q11396_11399_force_shield_arcane_purple_x3_AuraScript : public AuraScript { PrepareAuraScript(spell_q11396_11399_force_shield_arcane_purple_x3_AuraScript) - void HandleEffectApply(AuraEffect const * /*aurEff*/, AuraEffectHandleModes /*mode*/) + void HandleEffectApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* pTarget = GetTarget(); pTarget->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); pTarget->AddUnitState(UNIT_STAT_ROOT); } - void HandleEffectRemove(AuraEffect const * /*aurEff*/, AuraEffectHandleModes /*mode*/) + void HandleEffectRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { GetTarget()->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); } @@ -254,7 +254,7 @@ public: class spell_q11396_11399_scourging_crystal_controller_SpellScript : public SpellScript { PrepareSpellScript(spell_q11396_11399_scourging_crystal_controller_SpellScript); - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(SPELL_FORCE_SHIELD_ARCANE_PURPLE_X3)) return false; @@ -293,7 +293,7 @@ public: class spell_q11396_11399_scourging_crystal_controller_dummy_SpellScript : public SpellScript { PrepareSpellScript(spell_q11396_11399_scourging_crystal_controller_dummy_SpellScript); - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(SPELL_FORCE_SHIELD_ARCANE_PURPLE_X3)) return false; @@ -355,7 +355,7 @@ public: class spell_q11587_arcane_prisoner_rescue_SpellScript : public SpellScript { PrepareSpellScript(spell_q11587_arcane_prisoner_rescue_SpellScript) - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(SPELL_SUMMON_ARCANE_PRISONER_MALE)) return false; @@ -416,7 +416,7 @@ public: class spell_q11730_ultrasonic_screwdriver_SpellScript : public SpellScript { PrepareSpellScript(spell_q11730_ultrasonic_screwdriver_SpellScript) - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(SPELL_SUMMON_SCAVENGEBOT_004A8)) return false; @@ -545,7 +545,7 @@ public: { public: PrepareSpellScript(spell_q12634_despawn_fruit_tosser_SpellScript) - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(SPELL_BANANAS_FALL_TO_GROUND)) return false; @@ -640,7 +640,7 @@ public: { public: PrepareAuraScript(spell_q12851_going_bearback_AuraScript) - void HandleEffectApply(AuraEffect const * /*aurEff*/, AuraEffectHandleModes /*mode*/) + void HandleEffectApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (Unit* caster = GetCaster()) { @@ -694,7 +694,7 @@ public: { public: PrepareSpellScript(spell_q12937_relief_for_the_fallen_SpellScript) - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(SPELL_TRIGGER_AID_OF_THE_EARTHEN)) return false; @@ -745,7 +745,7 @@ class spell_q10041_q10040_who_are_they : public SpellScriptLoader { PrepareSpellScript(spell_q10041_q10040_who_are_they_SpellScript); - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(SPELL_QUESTGIVER)) return false; diff --git a/src/server/scripts/Spells/spell_rogue.cpp b/src/server/scripts/Spells/spell_rogue.cpp index b5be2691ae8..3dc3e315c6e 100644 --- a/src/server/scripts/Spells/spell_rogue.cpp +++ b/src/server/scripts/Spells/spell_rogue.cpp @@ -48,7 +48,7 @@ public: ROG_SPELL_CHEAT_DEATH_COOLDOWN = 31231, }; - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { return sSpellStore.LookupEntry(ROG_SPELL_CHEAT_DEATH_COOLDOWN); } @@ -59,7 +59,7 @@ public: return GetUnitOwner()->ToPlayer(); } - void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/) + void CalculateAmount(AuraEffect const* /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/) { // Set absorbtion amount to unlimited amount = -1; @@ -67,7 +67,7 @@ public: void Absorb(AuraEffect * /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount) { - Unit * target = GetTarget(); + Unit* target = GetTarget(); if (dmgInfo.GetDamage() < target->GetHealth()) return; if (target->ToPlayer()->HasSpellCooldown(ROG_SPELL_CHEAT_DEATH_COOLDOWN)) @@ -119,7 +119,7 @@ public: return true; } - void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/) + void CalculateAmount(AuraEffect const* /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/) { // Set absorbtion amount to unlimited amount = -1; @@ -153,7 +153,7 @@ class spell_rog_preparation : public SpellScriptLoader class spell_rog_preparation_SpellScript : public SpellScript { PrepareSpellScript(spell_rog_preparation_SpellScript) - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(ROGUE_SPELL_GLYPH_OF_PREPARATION)) return false; @@ -217,14 +217,14 @@ public: class spell_rog_prey_on_the_weak_AuraScript : public AuraScript { PrepareAuraScript(spell_rog_prey_on_the_weak_AuraScript) - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(ROGUE_SPELL_PREY_ON_THE_WEAK)) return false; return true; } - void HandleEffectPeriodic(AuraEffect const * /*aurEff*/) + void HandleEffectPeriodic(AuraEffect const* /*aurEff*/) { Unit* pTarget = GetTarget(); Unit* pVictim = pTarget->getVictim(); @@ -260,7 +260,7 @@ class spell_rog_shiv : public SpellScriptLoader class spell_rog_shiv_SpellScript : public SpellScript { PrepareSpellScript(spell_rog_shiv_SpellScript) - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(ROGUE_SPELL_SHIV_TRIGGERED)) return false; diff --git a/src/server/scripts/Spells/spell_shaman.cpp b/src/server/scripts/Spells/spell_shaman.cpp index 762dd9292a8..63c57155cec 100644 --- a/src/server/scripts/Spells/spell_shaman.cpp +++ b/src/server/scripts/Spells/spell_shaman.cpp @@ -54,7 +54,7 @@ public: return true; } - void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/) + void CalculateAmount(AuraEffect const* /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/) { // Set absorbtion amount to unlimited amount = -1; @@ -89,7 +89,7 @@ public: class spell_sha_fire_nova_SpellScript : public SpellScript { PrepareSpellScript(spell_sha_fire_nova_SpellScript) - bool Validate(SpellEntry const * spellEntry) + bool Validate(SpellEntry const* spellEntry) { if (!sSpellStore.LookupEntry(SHAMAN_SPELL_FIRE_NOVA_R1)) return false; @@ -148,7 +148,7 @@ public: class spell_sha_mana_tide_totem_SpellScript : public SpellScript { PrepareSpellScript(spell_sha_mana_tide_totem_SpellScript) - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(SHAMAN_SPELL_GLYPH_OF_MANA_TIDE)) return false; @@ -198,7 +198,7 @@ public: { PrepareAuraScript(spell_sha_earthbind_totem_AuraScript); - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(SHAMAN_TOTEM_SPELL_EARTHBIND_TOTEM)) return false; @@ -207,7 +207,7 @@ public: return true; } - void HandleEffectPeriodic(AuraEffect const * aurEff) + void HandleEffectPeriodic(AuraEffect const* aurEff) { Unit* target = GetTarget(); if (Unit *caster = aurEff->GetBase()->GetCaster()) diff --git a/src/server/scripts/Spells/spell_warlock.cpp b/src/server/scripts/Spells/spell_warlock.cpp index 0a361e642ab..a7b99aed6b5 100644 --- a/src/server/scripts/Spells/spell_warlock.cpp +++ b/src/server/scripts/Spells/spell_warlock.cpp @@ -46,7 +46,7 @@ class spell_warl_demonic_empowerment : public SpellScriptLoader { PrepareSpellScript(spell_warl_demonic_empowerment_SpellScript); - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(WARLOCK_DEMONIC_EMPOWERMENT_SUCCUBUS)) return false; @@ -67,7 +67,7 @@ class spell_warl_demonic_empowerment : public SpellScriptLoader { if (targetCreature->isPet()) { - CreatureTemplate const * ci = sObjectMgr->GetCreatureTemplate(targetCreature->GetEntry()); + CreatureTemplate const* ci = sObjectMgr->GetCreatureTemplate(targetCreature->GetEntry()); switch (ci->family) { case CREATURE_FAMILY_SUCCUBUS: @@ -119,7 +119,7 @@ class spell_warl_create_healthstone : public SpellScriptLoader static uint32 const iTypes[8][3]; - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(WARLOCK_IMPROVED_HEALTHSTONE_R1)) return false; @@ -134,7 +134,7 @@ class spell_warl_create_healthstone : public SpellScriptLoader { uint32 rank = 0; // Improved Healthstone - if (AuraEffect const * aurEff = unitTarget->GetDummyAuraEffect(SPELLFAMILY_WARLOCK, 284, 0)) + if (AuraEffect const* aurEff = unitTarget->GetDummyAuraEffect(SPELLFAMILY_WARLOCK, 284, 0)) { switch (aurEff->GetId()) { diff --git a/src/server/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp index 83c3d9c137c..3574c5c03fc 100644 --- a/src/server/scripts/Spells/spell_warrior.cpp +++ b/src/server/scripts/Spells/spell_warrior.cpp @@ -37,7 +37,7 @@ class spell_warr_last_stand : public SpellScriptLoader { PrepareSpellScript(spell_warr_last_stand_SpellScript); - bool Validate(SpellEntry const * /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { if (!sSpellStore.LookupEntry(WARRIOR_SPELL_LAST_STAND_TRIGGERED)) return false; diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp index fc0c8f058af..4ebb0fc3aea 100644 --- a/src/server/scripts/World/go_scripts.cpp +++ b/src/server/scripts/World/go_scripts.cpp @@ -65,7 +65,7 @@ class go_cat_figurine : public GameObjectScript public: go_cat_figurine() : GameObjectScript("go_cat_figurine") { } - bool OnGossipHello(Player *pPlayer, GameObject * /*pGO*/) + bool OnGossipHello(Player *pPlayer, GameObject* /*pGO*/) { pPlayer->CastSpell(pPlayer, SPELL_SUMMON_GHOST_SABER, true); return false; @@ -144,7 +144,7 @@ class go_barov_journal : public GameObjectScript public: go_barov_journal() : GameObjectScript("go_barov_journal") { } - bool OnGossipHello(Player *pPlayer, GameObject * /*pGO*/) + bool OnGossipHello(Player *pPlayer, GameObject* /*pGO*/) { if (pPlayer->HasSkill(SKILL_TAILORING) && pPlayer->GetBaseSkillValue(SKILL_TAILORING) >= 280 && !pPlayer->HasSpell(26086)) { @@ -163,7 +163,7 @@ class go_field_repair_bot_74A : public GameObjectScript public: go_field_repair_bot_74A() : GameObjectScript("go_field_repair_bot_74A") { } - bool OnGossipHello(Player *pPlayer, GameObject * /*pGO*/) + bool OnGossipHello(Player *pPlayer, GameObject* /*pGO*/) { if (pPlayer->HasSkill(SKILL_ENGINERING) && pPlayer->GetBaseSkillValue(SKILL_ENGINERING) >= 300 && !pPlayer->HasSpell(22704)) { @@ -210,7 +210,7 @@ class go_orb_of_command : public GameObjectScript public: go_orb_of_command() : GameObjectScript("go_orb_of_command") { } - bool OnGossipHello(Player *pPlayer, GameObject * /*pGO*/) + bool OnGossipHello(Player *pPlayer, GameObject* /*pGO*/) { if (pPlayer->GetQuestRewardStatus(7761)) pPlayer->CastSpell(pPlayer, 23460, true); @@ -228,7 +228,7 @@ class go_tablet_of_madness : public GameObjectScript public: go_tablet_of_madness() : GameObjectScript("go_tablet_of_madness") { } - bool OnGossipHello(Player *pPlayer, GameObject * /*pGO*/) + bool OnGossipHello(Player *pPlayer, GameObject* /*pGO*/) { if (pPlayer->HasSkill(SKILL_ALCHEMY) && pPlayer->GetSkillValue(SKILL_ALCHEMY) >= 300 && !pPlayer->HasSpell(24266)) { @@ -269,7 +269,7 @@ class go_jump_a_tron : public GameObjectScript public: go_jump_a_tron() : GameObjectScript("go_jump_a_tron") { } - bool OnGossipHello(Player *pPlayer, GameObject * /*pGO*/) + bool OnGossipHello(Player *pPlayer, GameObject* /*pGO*/) { if (pPlayer->GetQuestStatus(10111) == QUEST_STATUS_INCOMPLETE) pPlayer->CastSpell(pPlayer, 33382, true); @@ -379,7 +379,7 @@ class go_resonite_cask : public GameObjectScript public: go_resonite_cask() : GameObjectScript("go_resonite_cask") { } - bool OnGossipHello(Player * /*pPlayer*/, GameObject *pGO) + bool OnGossipHello(Player* /*pPlayer*/, GameObject *pGO) { if (pGO->GetGoType() == GAMEOBJECT_TYPE_GOOBER) pGO->SummonCreature(NPC_GOGGEROC, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 300000); @@ -470,7 +470,7 @@ class go_southfury_moonstone : public GameObjectScript public: go_southfury_moonstone() : GameObjectScript("go_southfury_moonstone") { } - bool OnGossipHello(Player *pPlayer, GameObject * /*pGO*/) + bool OnGossipHello(Player *pPlayer, GameObject* /*pGO*/) { //implicitTarget=48 not implemented as of writing this code, and manual summon may be just ok for our purpose //pPlayer->CastSpell(pPlayer, SPELL_SUMMON_RIZZLE, false); @@ -498,7 +498,7 @@ class go_tele_to_dalaran_crystal : public GameObjectScript public: go_tele_to_dalaran_crystal() : GameObjectScript("go_tele_to_dalaran_crystal") { } - bool OnGossipHello(Player *pPlayer, GameObject * /*pGO*/) + bool OnGossipHello(Player *pPlayer, GameObject* /*pGO*/) { if (pPlayer->GetQuestRewardStatus(QUEST_TELE_CRYSTAL_FLAG)) { @@ -520,7 +520,7 @@ class go_tele_to_violet_stand : public GameObjectScript public: go_tele_to_violet_stand() : GameObjectScript("go_tele_to_violet_stand") { } - bool OnGossipHello(Player *pPlayer, GameObject * /*pGO*/) + bool OnGossipHello(Player *pPlayer, GameObject* /*pGO*/) { if (pPlayer->GetQuestRewardStatus(QUEST_LEARN_LEAVE_RETURN) || pPlayer->GetQuestStatus(QUEST_LEARN_LEAVE_RETURN) == QUEST_STATUS_INCOMPLETE) return false; diff --git a/src/server/scripts/World/item_scripts.cpp b/src/server/scripts/World/item_scripts.cpp index 4b15cc79dd9..c6a74841fd1 100644 --- a/src/server/scripts/World/item_scripts.cpp +++ b/src/server/scripts/World/item_scripts.cpp @@ -190,7 +190,7 @@ class item_mysterious_egg : public ItemScript { public: item_mysterious_egg() : ItemScript("item_mysterious_egg") { } - bool OnExpire(Player *pPlayer, ItemTemplate const * /*pItemProto*/) + bool OnExpire(Player *pPlayer, ItemTemplate const* /*pItemProto*/) { ItemPosCountVec dest; uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 39883, 1); // Cracked Egg @@ -210,7 +210,7 @@ class item_disgusting_jar : public ItemScript public: item_disgusting_jar() : ItemScript("item_disgusting_jar") {} - bool OnExpire(Player *pPlayer, ItemTemplate const * /*pItemProto*/) + bool OnExpire(Player *pPlayer, ItemTemplate const* /*pItemProto*/) { ItemPosCountVec dest; uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 44718, 1); // Ripe Disgusting Jar @@ -259,7 +259,7 @@ class item_pile_fake_furs : public ItemScript public: item_pile_fake_furs() : ItemScript("item_pile_fake_furs") { } - bool OnUse(Player *pPlayer, Item * /*pItem*/, SpellCastTargets const & /*targets*/) + bool OnUse(Player *pPlayer, Item* /*pItem*/, SpellCastTargets const & /*targets*/) { GameObject *pGo = NULL; for (uint8 i = 0; i < CaribouTrapsNum; ++i) diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index c78bbb2bdd8..671892e9ef2 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -330,7 +330,7 @@ public: me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER); } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { @@ -922,7 +922,7 @@ public: me->SetHealth(me->CountPctFromMaxHealth(70)); } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void SpellHit(Unit* pCaster, const SpellEntry *Spell) { @@ -1094,7 +1094,7 @@ public: me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } @@ -1507,7 +1507,7 @@ public: npc_steam_tonkAI(Creature *c) : ScriptedAI(c) {} void Reset() {} - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void OnPossess(bool apply) { @@ -1552,9 +1552,9 @@ public: ExplosionTimer = 3000; } - void EnterCombat(Unit * /*who*/) {} - void AttackStart(Unit * /*who*/) {} - void MoveInLineOfSight(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} + void AttackStart(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { @@ -1668,7 +1668,7 @@ public: uint32 SpellTimer; bool IsViper; - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void Reset() { @@ -1689,7 +1689,7 @@ public: // Start attacking attacker of owner on first ai update after spawn - move in line of sight may choose better target if (!me->getVictim() && me->isSummon()) - if (Unit * Owner = me->ToTempSummon()->GetSummoner()) + if (Unit* Owner = me->ToTempSummon()->GetSummoner()) if (Owner->getAttackerForHelper()) AttackStart(Owner->getAttackerForHelper()); } @@ -1781,7 +1781,7 @@ public: if (Unit* own = me->GetOwner()) me->GetMotionMaster()->MoveFollow(own, 0, 0); } - void EnterCombat(Unit * /*who*/){} + void EnterCombat(Unit* /*who*/){} void UpdateAI(const uint32 diff) { if (me->HasAura(20372)) @@ -1851,7 +1851,7 @@ public: void InitializeAI() { CasterAI::InitializeAI(); - Unit * owner = me->GetOwner(); + Unit* owner = me->GetOwner(); if (!owner) return; // Inherit Master's Threat List (not yet implemented) @@ -1899,7 +1899,7 @@ public: void InitializeAI() { CasterAI::InitializeAI(); - Unit * owner = me->GetOwner(); + Unit* owner = me->GetOwner(); if (!owner) return; // Not needed to be despawned now @@ -1917,7 +1917,7 @@ public: } } - void JustDied(Unit * /*killer*/) + void JustDied(Unit* /*killer*/) { // Stop Feeding Gargoyle when it dies if (Unit *owner = me->GetOwner()) @@ -2037,13 +2037,13 @@ public: Reset(); } - void DamageTaken(Unit * /*done_by*/, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) { uiResetTimer = 5000; damage = 0; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { if (uiEntry != NPC_ADVANCED_TARGET_DUMMY && uiEntry != NPC_TARGET_DUMMY) return; @@ -2076,7 +2076,7 @@ public: uiDespawnTimer -= uiDiff; } } - void MoveInLineOfSight(Unit * /*who*/){return;} + void MoveInLineOfSight(Unit* /*who*/){return;} }; CreatureAI* GetAI(Creature* pCreature) const |