aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Northrend
diff options
context:
space:
mode:
authorSpp <spp@jorge.gr>2013-05-21 08:37:28 +0200
committerSpp <spp@jorge.gr>2013-05-21 08:37:28 +0200
commit00c11688974fc00342a62387b6e2d682884e0721 (patch)
treeaea7f86f5b812acb6c515edb6dca14274767b1fc /src/server/scripts/Northrend
parentd3c2af0f66c6bf7e9b47890820921c2c061ba2e2 (diff)
Core/Misc: Remove trailing whitespace, compile warnings and minor cosmetic changes
Diffstat (limited to 'src/server/scripts/Northrend')
-rw-r--r--src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp4
-rw-r--r--src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp54
-rw-r--r--src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h4
-rw-r--r--src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp4
4 files changed, 33 insertions, 33 deletions
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp
index bd8afded346..090ebbca69d 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp
@@ -148,10 +148,10 @@ class npc_announcer_toc10 : public CreatureScript
break;
}
}
-
+
if (i >= NUM_MESSAGES)
return false;
-
+
player->SEND_GOSSIP_MENU(_GossipMessage[i].msgnum, creature->GetGUID());
return true;
}
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp
index 4b2961d2616..105b4757066 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp
@@ -95,7 +95,7 @@ enum Yells
SAY_STORMWIND_ROLEPLAY_2 = 1,
SAY_STORMWIND_ROLEPLAY_3 = 2,
SAY_STORMWIND_ROLEPLAY_6 = 3,
-
+
// King Llane
SAY_STORMWIND_ROLEPLAY_5 = 0,
};
@@ -440,7 +440,7 @@ class boss_voice_of_yogg_saron : public CreatureScript
void EnterEvadeMode()
{
BossAI::EnterEvadeMode();
-
+
for (uint8 i = DATA_SARA; i <= DATA_MIMIRON_YS; ++i)
if (Creature* creature = ObjectAccessor::GetCreature(*me, instance->GetData64(i)))
creature->AI()->EnterEvadeMode();
@@ -448,7 +448,7 @@ class boss_voice_of_yogg_saron : public CreatureScript
// not sure, spoken by Sara (sound), regarding to wowwiki Voice whispers it
Map::PlayerList const& players = me->GetMap()->GetPlayers();
for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
- if (Player *player = itr->getSource())
+ if (Player* player = itr->getSource())
{
if (events.IsInPhase(PHASE_ONE))
Talk(WHISPER_VOICE_PHASE_1_WIPE, player->GetGUID());
@@ -670,16 +670,16 @@ class boss_sara : public CreatureScript
std::map<uint64, uint64>::const_iterator itr = _linkData.find(guid);
if (itr != _linkData.end())
return itr->second;
-
+
return 0;
}
-
+
void SetLinkBetween(uint64 player1, uint64 player2)
{
_linkData[player1] = player2;
_linkData[player2] = player1;
}
-
+
// called once for each target on aura remove
void RemoveLinkFrom(uint64 player1)
{
@@ -932,7 +932,7 @@ class boss_yogg_saron : public CreatureScript
Map::PlayerList const& players = me->GetMap()->GetPlayers();
for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
- if (Player *player = itr->getSource())
+ if (Player* player = itr->getSource())
{
player->RemoveAurasDueToSpell(SPELL_SANITY);
player->RemoveAurasDueToSpell(SPELL_INSANE);
@@ -1069,7 +1069,7 @@ class boss_brain_of_yogg_saron : public CreatureScript
uint8 illusion = _instance->GetData(DATA_ILLUSION);
if (++_tentaclesKilled >= (illusion == ICECROWN_ILLUSION ? 9 : 8))
{
- sCreatureTextMgr->SendChat(me, EMOTE_BRAIN_ILLUSION_SHATTERED, NULL, CHAT_MSG_ADDON, LANG_ADDON, TEXT_RANGE_AREA);
+ sCreatureTextMgr->SendChat(me, EMOTE_BRAIN_ILLUSION_SHATTERED, 0, CHAT_MSG_ADDON, LANG_ADDON, TEXT_RANGE_AREA);
_summons.DespawnAll();
DoCastAOE(SPELL_SHATTERED_ILLUSION, true);
_instance->HandleGameObject(_instance->GetData64(GO_BRAIN_ROOM_DOOR_1 + illusion), true);
@@ -1522,7 +1522,7 @@ class npc_observation_ring_keeper : public CreatureScript
DoCast(SPELL_TELEPORT);
Talk(SAY_KEEPER_CHOSEN_1, player->GetGUID());
Talk(SAY_KEEPER_CHOSEN_2, player->GetGUID());
-
+
switch (me->GetEntry())
{
case NPC_FREYA_OBSERVATION_RING:
@@ -2085,16 +2085,16 @@ class spell_yogg_saron_malady_of_the_mind : public SpellScriptLoader // 63830
return new spell_yogg_saron_malady_of_the_mind_AuraScript();
}
};
-
+
class spell_yogg_saron_brain_link : public SpellScriptLoader // 63802
{
public:
spell_yogg_saron_brain_link() : SpellScriptLoader("spell_yogg_saron_brain_link") { }
-
+
class spell_yogg_saron_brain_link_SpellScript : public SpellScript
{
PrepareSpellScript(spell_yogg_saron_brain_link_SpellScript);
-
+
void FilterTargets(std::list<WorldObject*>& targets)
{
targets.remove_if(Trinity::UnitAuraCheck(true, SPELL_ILLUSION_ROOM));
@@ -2104,17 +2104,17 @@ class spell_yogg_saron_brain_link : public SpellScriptLoader // 63802
targets.clear();
return;
}
-
+
if (SaraAI* ai = CAST_AI(SaraAI, GetCaster()->GetAI()))
ai->SetLinkBetween(targets.front()->GetGUID(), targets.back()->GetGUID());
}
-
+
void Register()
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_yogg_saron_brain_link_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
-
+
class spell_yogg_saron_brain_link_AuraScript : public AuraScript
{
PrepareAuraScript(spell_yogg_saron_brain_link_AuraScript);
@@ -2127,13 +2127,13 @@ class spell_yogg_saron_brain_link : public SpellScriptLoader // 63802
return false;
return true;
}
-
+
void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
Unit* caster = GetCaster();
if (!caster)
return;
-
+
if (SaraAI* ai = CAST_AI(SaraAI, caster->GetAI()))
{
if (GetTargetApplication()->GetRemoveMode() == AURA_REMOVE_BY_EXPIRE)
@@ -2148,36 +2148,36 @@ class spell_yogg_saron_brain_link : public SpellScriptLoader // 63802
}
}
}
-
+
void DummyTick(AuraEffect const* aurEff)
{
Unit* caster = GetCaster();
if (!caster)
return;
-
+
SaraAI* ai = CAST_AI(SaraAI, caster->GetAI());
if (!ai)
return;
-
+
Player* linked = ObjectAccessor::GetPlayer(*GetTarget(), ai->GetLinkedPlayerGUID(GetTarget()->GetGUID()));
if (!linked)
return;
-
+
GetTarget()->CastSpell(linked, (GetTarget()->GetDistance(linked) > (float)aurEff->GetAmount()) ? SPELL_BRAIN_LINK_DAMAGE : SPELL_BRAIN_LINK_NO_DAMAGE, true);
}
-
+
void Register()
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_yogg_saron_brain_link_AuraScript::DummyTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
OnEffectRemove += AuraEffectRemoveFn(spell_yogg_saron_brain_link_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL);
}
};
-
+
SpellScript* GetSpellScript() const
{
return new spell_yogg_saron_brain_link_SpellScript();
}
-
+
AuraScript* GetAuraScript() const
{
return new spell_yogg_saron_brain_link_AuraScript();
@@ -2212,7 +2212,7 @@ class spell_yogg_saron_boil_ominously : public SpellScriptLoader // 63030
{
public:
spell_yogg_saron_boil_ominously() : SpellScriptLoader("spell_yogg_saron_boil_ominously") { }
-
+
class spell_yogg_saron_boil_ominously_SpellScript : public SpellScript
{
PrepareSpellScript(spell_yogg_saron_boil_ominously_SpellScript);
@@ -2223,7 +2223,7 @@ class spell_yogg_saron_boil_ominously : public SpellScriptLoader // 63030
return false;
return true;
}
-
+
void HandleDummy(SpellEffIndex /*effIndex*/)
{
if (Unit* target = GetHitUnit())
@@ -2235,7 +2235,7 @@ class spell_yogg_saron_boil_ominously : public SpellScriptLoader // 63030
GetCaster()->CastSpell(GetCaster(), SPELL_SUMMON_GUARDIAN_1, true);
}
}
-
+
void Register()
{
OnEffectHitTarget += SpellEffectFn(spell_yogg_saron_boil_ominously_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h
index 86c0c4888ed..612be3b71e8 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h
@@ -21,7 +21,7 @@
#include "ObjectMgr.h"
#define UlduarScriptName "instance_ulduar"
-extern Position const ObservationRingKeepersPos[4];
+extern Position const ObservationRingKeepersPos[4];
extern Position const YSKeepersPos[4];
extern Position const AlgalonLandPos;
@@ -149,7 +149,7 @@ enum UlduarNPCs
NPC_SANITY_WELL = 33991,
NPC_DESCEND_INTO_MADNESS = 34072,
NPC_MARKED_IMMORTAL_GUARDIAN = 36064,
-
+
// Algalon the Observer
NPC_BRANN_BRONZBEARD_ALG = 34064,
NPC_AZEROTH = 34246,
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp
index 84829cdae12..8e726c10fca 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp
@@ -115,10 +115,10 @@ public:
/// There is a good reason to store them like this, we are going to shuffle the order.
for (uint32 i = PHASE_FRENZIED_WORGEN; i < PHASE_GORTOK_PALEHOOF; ++i)
Sequence[i] = Phase(i);
-
+
/// This ensures a random order and only executes each phase once.
std::random_shuffle(Sequence, Sequence + PHASE_GORTOK_PALEHOOF);
-
+
uiArcingSmashTimer = 15000;
uiImpaleTimer = 12000;
uiWhiteringRoarTimer = 10000;