Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 18:15:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core: Whitespace cleanup

Browse Source
This commit is contained in:
Vincent-Michael
2015-11-07 20:01:35 +01:00
parent ff9001ce1d
commit 7d5e7102cd
16 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/scripts/Commands/cs_cast.cpp
View File

@@ -120,7 +120,7 @@ public:
uint32 spellId = handler->extractSpellIdFromLink((char*)args);
if (!spellId)
return false;
if (!CheckSpellExistsAndIsValid(handler, spellId))
return false;
@@ -218,7 +218,7 @@ public:
uint32 spellId = handler->extractSpellIdFromLink((char*)args);
if (!spellId)
return false;
if (!CheckSpellExistsAndIsValid(handler, spellId))
return false;
@@ -251,7 +251,7 @@ public:
uint32 spellId = handler->extractSpellIdFromLink((char*)args);
if (!spellId)
return false;
if (!CheckSpellExistsAndIsValid(handler, spellId))
return false;

6
src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp
View File

@@ -116,7 +116,7 @@ public:
void JustSummoned(Creature* summon) override
{
BossAI::JustSummoned(summon);
if (me->IsInCombat())
if (summon->GetEntry() == NPC_CRYPT_GUARD)
summon->AI()->Talk(EMOTE_SPAWN, me);
@@ -160,7 +160,7 @@ public:
Talk(SAY_AGGRO);
summons.DoZoneInCombat();
events.SetPhase(PHASE_NORMAL);
events.ScheduleEvent(EVENT_IMPALE, urand(10 * IN_MILLISECONDS, 20 * IN_MILLISECONDS), 0, PHASE_NORMAL);
events.ScheduleEvent(EVENT_SCARABS, urand(20 * IN_MILLISECONDS, 30 * IN_MILLISECONDS), 0, PHASE_NORMAL);
@@ -209,7 +209,7 @@ public:
Talk(EMOTE_LOCUST);
DoCast(me, SPELL_LOCUST_SWARM);
events.ScheduleEvent(EVENT_SPAWN_GUARD, 3 * IN_MILLISECONDS);
events.ScheduleEvent(EVENT_LOCUST_ENDS, RAID_MODE(19, 23) * IN_MILLISECONDS);
events.ScheduleEvent(EVENT_LOCUST, 90000);
events.SetPhase(PHASE_SWARM);

4
src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp
View File

@@ -103,7 +103,7 @@ public:
{
_EnterCombat();
Talk(SAY_AGGRO);
eruptSection = 3;
events.ScheduleEvent(EVENT_DISRUPT, urand(15 * IN_MILLISECONDS, 20 * IN_MILLISECONDS), 0, PHASE_FIGHT);
events.ScheduleEvent(EVENT_FEVER, urand(10 * IN_MILLISECONDS, 20 * IN_MILLISECONDS), 0, PHASE_FIGHT);
@@ -182,7 +182,7 @@ public:
private:
uint32 eruptSection;
bool eruptDirection;
bool safetyDance; // is achievement still possible? (= no player deaths yet)
};

10
src/server/scripts/Northrend/Naxxramas/boss_noth.cpp
View File

@@ -178,7 +178,7 @@ public:
return;
if (damage < me->GetHealth())
return;
me->SetHealth(1u);
damage = 0u;
}
@@ -226,7 +226,7 @@ public:
case EVENT_WARRIOR:
Talk(SAY_SUMMON);
Talk(EMOTE_SUMMON);
CastSummon(RAID_MODE(2, 3), 0, 0);
events.ScheduleEvent(EVENT_WARRIOR, 40 * IN_MILLISECONDS, 0, PHASE_GROUND);
@@ -291,7 +291,7 @@ public:
break;
case EVENT_GROUND:
++balconyCount;
DoCastAOE(SPELL_TELEPORT_BACK);
Talk(EMOTE_TELEPORT_2);
@@ -308,7 +308,7 @@ public:
{
/* workaround for movechase breaking after blinking
without this noth would just stand there unless his current target moves */
if (justBlinked && me->GetVictim() && !me->IsWithinMeleeRange(me->EnsureVictim()))
if (justBlinked && me->GetVictim() && !me->IsWithinMeleeRange(me->EnsureVictim()))
{
me->GetMotionMaster()->Clear();
me->GetMotionMaster()->MoveChase(me->EnsureVictim());
@@ -321,7 +321,7 @@ public:
private:
uint32 balconyCount;
bool justBlinked;
uint32 _SummonWarriorSpells[N_WARRIOR_SPELLS];

2
src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
View File

@@ -75,7 +75,7 @@ void OPvPCapturePointEP_EWT::ChangeState()
auto bounds = map->GetGameObjectBySpawnIdStore().equal_range(m_capturePointSpawnId);
for (auto itr = bounds.first; itr != bounds.second; ++itr)
itr->second->SetGoArtKit(artkit);
bounds = map->GetGameObjectBySpawnIdStore().equal_range(m_Objects[EP_EWT_FLAGS]);
for (auto itr = bounds.first; itr != bounds.second; ++itr)
itr->second->SetGoArtKit(artkit);

2
src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp
View File

@@ -82,7 +82,7 @@ class boss_shattered_executioner : public CreatureScript
void Reset() override
{
_Reset();
// _Reset() resets the loot mode, so we add them again, if any
uint32 prisonersExecuted = instance->GetData(DATA_PRISONERS_EXECUTED);
if (prisonersExecuted == 0)

14
src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
View File

@@ -297,7 +297,7 @@ const float CAPERNIAN_DISTANCE = 20.0f; //she casts away fro
Position const afGravityPos = {795.0f, 0.0f, 70.0f};
Position const TransitionPos[6] =
Position const TransitionPos[6] =
{
// First two values are not static, they seem to differ on each sniff.
{ 794.0522f, -0.96732f, 48.97848f, 0.0f },
@@ -869,7 +869,7 @@ class boss_thaladred_the_darkener : public CreatureScript
public:
boss_thaladred_the_darkener() : CreatureScript("boss_thaladred_the_darkener") { }
struct boss_thaladred_the_darkenerAI : public advisorbase_ai
{
boss_thaladred_the_darkenerAI(Creature* creature) : advisorbase_ai(creature)
@@ -963,7 +963,7 @@ class boss_lord_sanguinar : public CreatureScript
public:
boss_lord_sanguinar() : CreatureScript("boss_lord_sanguinar") { }
struct boss_lord_sanguinarAI : public advisorbase_ai
{
boss_lord_sanguinarAI(Creature* creature) : advisorbase_ai(creature)
@@ -1027,7 +1027,7 @@ class boss_grand_astromancer_capernian : public CreatureScript
public:
boss_grand_astromancer_capernian() : CreatureScript("boss_grand_astromancer_capernian") { }
struct boss_grand_astromancer_capernianAI : public advisorbase_ai
{
boss_grand_astromancer_capernianAI(Creature* creature) : advisorbase_ai(creature)
@@ -1307,7 +1307,7 @@ class npc_phoenix_tk : public CreatureScript
public:
npc_phoenix_tk() : CreatureScript("npc_phoenix_tk") { }
struct npc_phoenix_tkAI : public ScriptedAI
{
npc_phoenix_tkAI(Creature* creature) : ScriptedAI(creature)
@@ -1366,7 +1366,7 @@ class npc_phoenix_egg_tk : public CreatureScript
public:
npc_phoenix_egg_tk() : CreatureScript("npc_phoenix_egg_tk") { }
struct npc_phoenix_egg_tkAI : public ScriptedAI
{
npc_phoenix_egg_tkAI(Creature* creature) : ScriptedAI(creature)
@@ -1464,7 +1464,7 @@ class spell_kael_gravity_lapse : public SpellScriptLoader
{
OnEffectHitTarget += SpellEffectFn(spell_kael_gravity_lapse_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
private:
uint8 _targetCount;
};

10
src/server/scripts/Outland/zone_hellfire_peninsula.cpp
View File

@@ -483,7 +483,7 @@ class npc_barada : public CreatureScript
{
public:
npc_barada() : CreatureScript("npc_barada") { }
struct npc_baradaAI : public ScriptedAI
{
npc_baradaAI(Creature* creature) : ScriptedAI(creature)
@@ -779,7 +779,7 @@ public:
me->SetCanFly(true);
me->SetSpeed(MOVE_RUN, 0.2f);
me->SetFacingTo(3.207566f);
me->GetMotionMaster()->MoveJump(exorcismPos[2], 2.0f, 2.0f);
@@ -860,14 +860,14 @@ public:
}
}
}
private:
EventMap events;
SummonList summons;
uint8 circleRounds;
uint8 point;
bool wpreached;
};