From 85197283498f18939f63e4de703cb0e11ee76785 Mon Sep 17 00:00:00 2001 From: AriDEV Date: Mon, 15 Jan 2024 13:26:32 +0100 Subject: [PATCH] Server/Misc: codestyle --- src/server/game/Cinematic/CinematicPathMgr.cpp | 5 ----- src/server/game/Cinematic/CinematicPathMgr.h | 2 +- src/server/game/Movement/Waypoints/WaypointManager.cpp | 1 - .../EasternKingdoms/Stratholme/boss_baron_rivendare.cpp | 1 - .../CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp | 1 - .../ObsidianSanctum/instance_obsidian_sanctum.cpp | 1 - src/server/scripts/Spells/spell_druid.cpp | 2 -- src/server/scripts/Spells/spell_paladin.cpp | 6 ++---- 8 files changed, 3 insertions(+), 16 deletions(-) diff --git a/src/server/game/Cinematic/CinematicPathMgr.cpp b/src/server/game/Cinematic/CinematicPathMgr.cpp index 67686d99d98..52c884361a1 100644 --- a/src/server/game/Cinematic/CinematicPathMgr.cpp +++ b/src/server/game/Cinematic/CinematicPathMgr.cpp @@ -169,11 +169,6 @@ struct CameraV10 ////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////// -/// Constructor -CinematicSequenceMgr::CinematicSequenceMgr() -{ - -} /// Destructor CinematicSequenceMgr::~CinematicSequenceMgr() { diff --git a/src/server/game/Cinematic/CinematicPathMgr.h b/src/server/game/Cinematic/CinematicPathMgr.h index afdbdf76216..7b75e8579aa 100644 --- a/src/server/game/Cinematic/CinematicPathMgr.h +++ b/src/server/game/Cinematic/CinematicPathMgr.h @@ -39,7 +39,7 @@ class CinematicSequenceMgr /// Singleton access friend class ACE_Singleton < CinematicSequenceMgr, ACE_Null_Mutex > ; /// Constructor - CinematicSequenceMgr(); + CinematicSequenceMgr() { }; /// Destructor ~CinematicSequenceMgr(); diff --git a/src/server/game/Movement/Waypoints/WaypointManager.cpp b/src/server/game/Movement/Waypoints/WaypointManager.cpp index a856ee3c976..e7d8800164c 100644 --- a/src/server/game/Movement/Waypoints/WaypointManager.cpp +++ b/src/server/game/Movement/Waypoints/WaypointManager.cpp @@ -119,7 +119,6 @@ void WaypointMgr::ReloadPath(uint32 id) wp->event_chance = fields[8].GetUInt8(); path.push_back(wp); - } while (result->NextRow()); } diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp index 2413b62895e..7dbad4f194d 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp @@ -156,7 +156,6 @@ class boss_baron_rivendare : public CreatureScript DoMeleeAttackIfReady(); } }; - }; void AddSC_boss_baron_rivendare() diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp index ffe09fa21f1..ae2a80b9867 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp @@ -142,7 +142,6 @@ class boss_salramm : public CreatureScript Talk(SAY_SLAY); } }; - }; void AddSC_boss_salramm() diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp index 3f4fd26bb16..4dff116a9eb 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp @@ -126,7 +126,6 @@ class instance_obsidian_sanctum : public InstanceMapScript return 0; } }; - }; void AddSC_instance_obsidian_sanctum() diff --git a/src/server/scripts/Spells/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp index 313a49d75dd..cfce5c5c91a 100644 --- a/src/server/scripts/Spells/spell_druid.cpp +++ b/src/server/scripts/Spells/spell_druid.cpp @@ -556,7 +556,6 @@ class spell_dru_might_of_ursoc: public SpellScriptLoader // then calculate amount amount = aurEff->GetBase()->GetUnitOwner()->CountPctFromMaxHealth(amount); } - } void Register() override @@ -569,7 +568,6 @@ class spell_dru_might_of_ursoc: public SpellScriptLoader { return new spell_dru_might_of_ursoc_AuraScript(); } - }; // -16972 - Predatory Strikes diff --git a/src/server/scripts/Spells/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp index 1665be2afcb..495538911b9 100644 --- a/src/server/scripts/Spells/spell_paladin.cpp +++ b/src/server/scripts/Spells/spell_paladin.cpp @@ -185,8 +185,7 @@ class spell_pal_judgment : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_pal_judgment_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); - + OnEffectHitTarget += SpellEffectFn(spell_pal_judgment_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; @@ -222,8 +221,7 @@ class spell_pal_selfless_healer : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), SPELL_PALADIN_SELFLESS_HEALER_BUFF); if (GetTarget()->GetAffectingPlayer()->GetTalentSpecialization(SPEC_PALADIN_HOLY)) - GetTarget()->CastSpell(GetTarget(), SPELL_PALADIN_SELFLESS_HEALER_ENERGIZE); - + GetTarget()->CastSpell(GetTarget(), SPELL_PALADIN_SELFLESS_HEALER_ENERGIZE); } void Register() override {