aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Northrend
diff options
context:
space:
mode:
authorKargatum <dowlandtop@yandex.com>2021-01-03 17:47:07 +0700
committerShauren <shauren.trinity@gmail.com>2022-03-05 20:07:57 +0100
commit373ed8f46bef3fda0ffc2c4e2b6d39527d595c8e (patch)
tree9580280f271db59e2abdb26094ab99ec43354a18 /src/server/scripts/Northrend
parent05a9b2d2cb40df7daedbce2712609f6bab9ad0e1 (diff)
Core: whitespace cleanup, reduce double blank line to single (#25795)
* Core/Misc: fix double empty line * worldserver.conf (cherry picked from commit a32b6b8ac4c81128a56b282f20837fb085bdd9e7)
Diffstat (limited to 'src/server/scripts/Northrend')
-rw-r--r--src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp1
-rw-r--r--src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp2
-rw-r--r--src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp1
-rw-r--r--src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp1
-rw-r--r--src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp3
-rw-r--r--src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp2
-rw-r--r--src/server/scripts/Northrend/Naxxramas/naxxramas.h1
-rw-r--r--src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp1
-rw-r--r--src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp1
-rw-r--r--src/server/scripts/Northrend/zone_borean_tundra.cpp2
-rw-r--r--src/server/scripts/Northrend/zone_grizzly_hills.cpp1
-rw-r--r--src/server/scripts/Northrend/zone_icecrown.cpp1
-rw-r--r--src/server/scripts/Northrend/zone_zuldrak.cpp1
13 files changed, 0 insertions, 18 deletions
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 37bd09ccc62..7c2d2479dba 100644
--- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp
@@ -126,7 +126,6 @@ struct boss_volazj : public BossAI
if (me->HasUnitFlag(UNIT_FLAG_NOT_SELECTABLE))
damage = 0;
-
if ((GetHealthPct(0) >= 66 && GetHealthPct(damage) < 66)||
(GetHealthPct(0) >= 33 && GetHealthPct(damage) < 33))
{
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
index d4dde67813b..7e3a6734b84 100644
--- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
+++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
@@ -1908,8 +1908,6 @@ class spell_halion_blazing_aura : public SpellScriptLoader
}
};
-
-
void AddSC_boss_halion()
{
new boss_halion();
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
index 21eb7f34ceb..755f8601732 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
@@ -107,7 +107,6 @@ enum Misc
POINT_SUMMONED = 1
};
-
struct boss_jaraxxus : public BossAI
{
boss_jaraxxus(Creature* creature) : BossAI(creature, DATA_JARAXXUS) { }
diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
index 6d4f1ecadb8..ff2ed619193 100644
--- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
@@ -274,7 +274,6 @@ class npc_pit_of_saron_icicle : public CreatureScript
}
};
-
class spell_pos_ice_shards : public SpellScriptLoader
{
public:
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
index 230d3146a4d..817dff2326f 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
@@ -124,7 +124,6 @@ enum Actions
ACTION_ACQUIRE_TARGET
};
-
/* Room side checking logic */
static AreaBoundary* const livingSide = new RectangleBoundary(2633.84f, 2750.49f, -3434.0f, -3360.78f);
static AreaBoundary* const deadSide = new RectangleBoundary(2633.84f, 2750.49f, -3360.78f, -3285.0f);
@@ -161,7 +160,6 @@ static Player* FindEligibleTarget(Creature const* me, bool isGateOpen)
return nullptr;
}
-
/* Wave data */
typedef std::pair<uint32, uint8> GothikWaveEntry; // (npcEntry, npcCount)
typedef std::set<GothikWaveEntry> GothikWave;
@@ -286,7 +284,6 @@ const GothikWaveData waves25 =
0}
};
-
// GUID of first trigger NPC (used as offset for guid checks)
// 0-1 are living side soul triggers, 2-3 are spectral side soul triggers, 4 is living rider spawn trigger, 5-7 are living other spawn trigger, 8-12 are skull pile triggers
const uint32 CGUID_TRIGGER = 127618;
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp
index 0baebfb12da..77a328c58fe 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp
@@ -122,7 +122,6 @@ enum PetMisc
OVERLOAD_DISTANCE = 28
};
-
//Thaddius
enum ThaddiusYells
{
@@ -1242,7 +1241,6 @@ class achievement_thaddius_shocking : public AchievementCriteriaScript
}
};
-
void AddSC_boss_thaddius()
{
RegisterNaxxramasCreatureAI(boss_thaddius);
diff --git a/src/server/scripts/Northrend/Naxxramas/naxxramas.h b/src/server/scripts/Northrend/Naxxramas/naxxramas.h
index 918fe62e218..dfcae04fc8d 100644
--- a/src/server/scripts/Northrend/Naxxramas/naxxramas.h
+++ b/src/server/scripts/Northrend/Naxxramas/naxxramas.h
@@ -212,7 +212,6 @@ enum NAXInstanceTexts
SAY_DIALOGUE_SAPPHIRON_LICH_KING2 = 2
};
-
template <class AI, class T>
inline AI* GetNaxxramasAI(T* obj)
{
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp
index e722a9b8546..1530ade9282 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp
@@ -502,7 +502,6 @@ struct npc_pummeller : public ScriptedAI
return;
}
-
if (Creature* xt002 = _instance->GetCreature(BOSS_XT002))
xt002->AI()->JustSummoned(me);
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp
index 47e95d0fc7c..3fed30c572b 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp
@@ -72,7 +72,6 @@ class instance_utgarde_pinnacle : public InstanceMapScript
LoadObjectData(creatureData, gameObjectData);
}
-
void OnGameObjectCreate(GameObject* go) override
{
InstanceScript::OnGameObjectCreate(go);
diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp
index 1f19e810e34..34f35cdd96d 100644
--- a/src/server/scripts/Northrend/zone_borean_tundra.cpp
+++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp
@@ -136,7 +136,6 @@ public:
void JustEngagedWith(Unit* /*who*/) override { }
void MoveInLineOfSight(Unit* /*who*/) override { }
-
void JustDied(Unit* killer) override
{
if (!killer || killer->GetTypeId() != TYPEID_PLAYER)
@@ -265,7 +264,6 @@ public:
void JustEngagedWith(Unit* /*who*/) override { }
void MoveInLineOfSight(Unit* /*who*/) override { }
-
void JustDied(Unit* /*killer*/) override
{
if (GameObject* go_caribou = ObjectAccessor::GetGameObject(*me, go_caribouGUID))
diff --git a/src/server/scripts/Northrend/zone_grizzly_hills.cpp b/src/server/scripts/Northrend/zone_grizzly_hills.cpp
index 3f448058ed9..218d8d16d2d 100644
--- a/src/server/scripts/Northrend/zone_grizzly_hills.cpp
+++ b/src/server/scripts/Northrend/zone_grizzly_hills.cpp
@@ -240,7 +240,6 @@ public:
void MoveInLineOfSight(Unit* /*who*/) override { }
-
void UpdateAI(uint32 /*diff*/) override
{
if (!UpdateVictim())
diff --git a/src/server/scripts/Northrend/zone_icecrown.cpp b/src/server/scripts/Northrend/zone_icecrown.cpp
index 127895e2d91..5a1f9febe1c 100644
--- a/src/server/scripts/Northrend/zone_icecrown.cpp
+++ b/src/server/scripts/Northrend/zone_icecrown.cpp
@@ -445,7 +445,6 @@ public:
void MoveInLineOfSight(Unit* /*who*/) override { }
-
void JustSummoned(Creature* Summoned) override
{
Summons.Summon(Summoned);
diff --git a/src/server/scripts/Northrend/zone_zuldrak.cpp b/src/server/scripts/Northrend/zone_zuldrak.cpp
index ca4bca84ac4..6b1022c631f 100644
--- a/src/server/scripts/Northrend/zone_zuldrak.cpp
+++ b/src/server/scripts/Northrend/zone_zuldrak.cpp
@@ -164,7 +164,6 @@ public:
}
};
-
/*####
## npc_released_offspring_harkoa
####*/