diff options
| author | Kargatum <dowlandtop@yandex.com> | 2021-01-03 17:47:07 +0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-03 11:47:07 +0100 |
| commit | a32b6b8ac4c81128a56b282f20837fb085bdd9e7 (patch) | |
| tree | dc78724705a27ed8032372f73fbf5b318abbd630 /src/server/scripts/Northrend | |
| parent | 4ea64b515aa952662dce11fd1012c566ae0d2449 (diff) | |
Core: whitespace cleanup, reduce double blank line to single (#25795)
* Core/Misc: fix double empty line
* worldserver.conf
Diffstat (limited to 'src/server/scripts/Northrend')
16 files changed, 0 insertions, 22 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 d8a4fa39560..abe2d013d15 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp @@ -123,7 +123,6 @@ struct boss_volazj : public BossAI if (me->HasFlag(UNIT_FIELD_FLAGS, 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 69a9462501b..b711ba107a6 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp @@ -1901,8 +1901,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 3dd6216da45..392522de2a9 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp @@ -108,7 +108,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 1c1d2bf59d7..2d0ad4ccbed 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp @@ -275,7 +275,6 @@ class npc_pit_of_saron_icicle : public CreatureScript } }; - class spell_pos_ice_shards : public SpellScriptLoader { public: diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp index c8b960276fb..d19b952b705 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp @@ -1081,7 +1081,6 @@ class spell_putricide_unbound_plague : public SpellScript } } - targets.remove_if(Trinity::UnitAuraCheck(true, sSpellMgr->GetSpellIdForDifficulty(SPELL_UNBOUND_PLAGUE, GetCaster()))); Trinity::Containers::RandomResize(targets, 1); } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp index d05cc534405..dabd3ef350c 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp @@ -129,7 +129,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); @@ -166,7 +165,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; @@ -291,7 +289,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_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp index 236ccf7a042..e31c07fc482 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp @@ -497,7 +497,6 @@ class go_sapphiron_birth : public GameObjectScript } }; - class spell_sapphiron_change_blizzard_target : public SpellScriptLoader { public: diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp index f998b7ba5e6..7f1c25fd6bb 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 { @@ -1243,7 +1242,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 fa0eb272cf9..a7967cdcda0 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp @@ -505,7 +505,6 @@ struct npc_pummeller : public ScriptedAI return; } - if (Creature* xt002 = _instance->GetCreature(BOSS_XT002)) xt002->AI()->JustSummoned(me); @@ -616,7 +615,6 @@ private: TaskScheduler _scheduler; }; - struct npc_life_spark : public ScriptedAI { npc_life_spark(Creature* creature) : ScriptedAI(creature) { } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp index 10bf8aa79e2..a6306f2231a 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp @@ -368,7 +368,6 @@ class spell_frost_tomb : public SpellScriptLoader } }; - class achievement_on_the_rocks : public AchievementCriteriaScript { public: 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 9b5b5a8cb4a..3448b9a3ee3 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 21230347e80..74b4be75a9f 100644 --- a/src/server/scripts/Northrend/zone_borean_tundra.cpp +++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp @@ -135,7 +135,6 @@ public: void JustEngagedWith(Unit* /*who*/) override { } void MoveInLineOfSight(Unit* /*who*/) override { } - void JustDied(Unit* killer) override { if (!killer || killer->GetTypeId() != TYPEID_PLAYER) @@ -267,7 +266,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 ec4d7df9690..2091c630761 100644 --- a/src/server/scripts/Northrend/zone_grizzly_hills.cpp +++ b/src/server/scripts/Northrend/zone_grizzly_hills.cpp @@ -241,7 +241,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 8f3ce98422e..956aed1f29c 100644 --- a/src/server/scripts/Northrend/zone_icecrown.cpp +++ b/src/server/scripts/Northrend/zone_icecrown.cpp @@ -446,7 +446,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 7469dbccb1b..b0d846a8412 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 ####*/ |
