From 631d7b7b3b440cc9eba8a2c96135e78a8fb49ac7 Mon Sep 17 00:00:00 2001 From: luis Date: Wed, 27 May 2026 16:38:24 -0300 Subject: [PATCH] core fix warnings --- src/server/game/Combat/ThreatManager.cpp | 1 - .../game/Entities/AreaTrigger/AreaTrigger.cpp | 2 +- .../game/Entities/AreaTrigger/AreaTrigger.h | 2 +- src/server/game/Housing/HouseInteriorMap.cpp | 6 ++-- src/server/game/Housing/HousingMap.cpp | 8 ++--- src/server/game/Scripting/ScriptMgr.h | 4 +-- .../Boss_Overgrown_Ancient.cpp | 2 +- .../Boss_Decatriarch_Wratheye.cpp | 2 +- .../BrackenhideHollow/Boss_Treemouth.cpp | 6 ++-- .../WindrunnerSpire/boss_commander_kroluk.cpp | 12 +++++-- .../WindrunnerSpire/boss_derelict_duo.cpp | 34 ++++++++++++------- src/server/scripts/Spells/spell_mage.cpp | 2 +- src/server/scripts/Spells/spell_warrior.cpp | 2 +- 13 files changed, 49 insertions(+), 34 deletions(-) diff --git a/src/server/game/Combat/ThreatManager.cpp b/src/server/game/Combat/ThreatManager.cpp index 0133025e9..cf65aaf87 100644 --- a/src/server/game/Combat/ThreatManager.cpp +++ b/src/server/game/Combat/ThreatManager.cpp @@ -39,7 +39,6 @@ void ThreatReference::AddThreat(float amount) { if (amount == 0.0f) return; - float oldThreat = _baseAmount; _baseAmount = std::max(_baseAmount + amount, 0.0f); if (amount > 0.0f) HeapNotifyIncreased(); diff --git a/src/server/game/Entities/AreaTrigger/AreaTrigger.cpp b/src/server/game/Entities/AreaTrigger/AreaTrigger.cpp index d78352efa..ad94d0ff1 100644 --- a/src/server/game/Entities/AreaTrigger/AreaTrigger.cpp +++ b/src/server/game/Entities/AreaTrigger/AreaTrigger.cpp @@ -1562,7 +1562,7 @@ void AreaTrigger::ClearValuesChangesMask() } //WowCommunity -AreaTrigger* AreaTrigger::CreateStaticAreaTrigger(AreaTriggerCreatePropertiesId areaTriggerCreatePropertiesId, Map* map, Position const& pos, int32 duration /*= -1*/, bool addToMap /*= true*/) +AreaTrigger* AreaTrigger::CreateStaticAreaTrigger(AreaTriggerCreatePropertiesId areaTriggerCreatePropertiesId, Map* map, Position const& pos, int32 duration /*= -1*/) { AreaTrigger* at = new AreaTrigger(); if (!at->Create(areaTriggerCreatePropertiesId, map, pos, duration, nullptr, nullptr, nullptr, { 0, 0 }, nullptr, nullptr, nullptr)) diff --git a/src/server/game/Entities/AreaTrigger/AreaTrigger.h b/src/server/game/Entities/AreaTrigger/AreaTrigger.h index 5f5d756b6..8f0d45d03 100644 --- a/src/server/game/Entities/AreaTrigger/AreaTrigger.h +++ b/src/server/game/Entities/AreaTrigger/AreaTrigger.h @@ -122,7 +122,7 @@ class TC_GAME_API AreaTrigger final : public WorldObject, public GridObject(room->GridX); float roomY = _originY + static_cast(room->GridY); @@ -310,7 +310,7 @@ void HouseInteriorMap::SpawnRoomMeshObjectsFromList(std::vectorGetPhaseShift(), PHASE_USE_FLAGS_ALWAYS_VISIBLE, 0, 0); @@ -1488,7 +1488,7 @@ void HousingMap::SendNeighborhoodMapEntryAuras(Player* player) // // 431539 (Morning Star) and 1266699 (Sound Squisher) appeared in the // same retail burst but are character/ambient auras pre-existing before - // map entry (first seen at idx 5762/5786, 127× + 8× before map entry). + // map entry (first seen at idx 5762/5786, 127× + 8× before map entry). // Core TC aura re-sync on map change already handles those; we emit // only the four truly-new housing-specific auras here. @@ -2841,7 +2841,7 @@ uint32 HousingMap::SpawnExtCompTree(uint8 plotIndex, uint32 extCompID, float wz = parentWorldPos.GetPositionZ() + pos.GetPositionZ(); // Extract the Z-axis rotation contribution of the hook quaternion so // that grand-children of this mesh apply the correct cumulative yaw. - // yaw = atan2(2*(w*z + x*y), 1 - 2*(y² + z²)) + // yaw = atan2(2*(w*z + x*y), 1 - 2*(y² + z²)) float thisZRot = std::atan2( 2.0f * (rot.w * rot.z + rot.x * rot.y), 1.0f - 2.0f * (rot.y * rot.y + rot.z * rot.z)); diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index 72995d3cc..c8ba73083 100644 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -792,7 +792,7 @@ class TC_GAME_API PlayerScript : public ScriptObject // Called when a player completes a movie virtual void OnMovieComplete(Player* player, uint32 movieId); - virtual void OnQuestAbandon(Player* player, Quest const* quest) {} + virtual void OnQuestAbandon(Player* /*player*/, Quest const* /*quest*/) {} }; class TC_GAME_API AccountScript : public ScriptObject @@ -964,7 +964,7 @@ class TC_GAME_API QuestScript : public ScriptObject virtual void OnQuestObjectiveChange(Player* player, Quest const* quest, QuestObjective const& objective, int32 oldAmount, int32 newAmount); // Called when a quest is abandoned - virtual void OnQuestAbandon(Player* player, Quest const* quest) {} + virtual void OnQuestAbandon(Player* /*player*/, Quest const* /*quest*/) {} }; class TC_GAME_API WorldStateScript : public ScriptObject diff --git a/src/server/scripts/DragonIsles/AlgetharAcademy/Boss_Overgrown_Ancient.cpp b/src/server/scripts/DragonIsles/AlgetharAcademy/Boss_Overgrown_Ancient.cpp index ba2b3b61b..717e9e947 100644 --- a/src/server/scripts/DragonIsles/AlgetharAcademy/Boss_Overgrown_Ancient.cpp +++ b/src/server/scripts/DragonIsles/AlgetharAcademy/Boss_Overgrown_Ancient.cpp @@ -41,7 +41,7 @@ struct Boss_Overgrown_ancient : public BossAI BossAI::JustEngagedWith(who); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); events.ScheduleEvent(EVENT_SPLINTERBARKS, 4s); - events.ScheduleEvent(SPELL_HEALING_TOUCH, 25s); + events.ScheduleEvent(EVENT_HEALING_TOUCH, 25s); events.ScheduleEvent(EVENT_BARK_BREAKER, 9s); events.ScheduleEvent(EVENT_GERMINATE, 11s); } diff --git a/src/server/scripts/DragonIsles/BrackenhideHollow/Boss_Decatriarch_Wratheye.cpp b/src/server/scripts/DragonIsles/BrackenhideHollow/Boss_Decatriarch_Wratheye.cpp index 992a03be3..94feecd85 100644 --- a/src/server/scripts/DragonIsles/BrackenhideHollow/Boss_Decatriarch_Wratheye.cpp +++ b/src/server/scripts/DragonIsles/BrackenhideHollow/Boss_Decatriarch_Wratheye.cpp @@ -27,7 +27,7 @@ enum decatriarchevents EVENT_DECAYING_STRENGHT = 1, //40s EVENT_ROBUST_TOTEM, //16s EVENT_COOKING_ROOTCLOUD, //5s - EVENT_DECAY_STRIKE = 373917, //11s + EVENT_DECAY_STRIKE, //11s }; //186121 diff --git a/src/server/scripts/DragonIsles/BrackenhideHollow/Boss_Treemouth.cpp b/src/server/scripts/DragonIsles/BrackenhideHollow/Boss_Treemouth.cpp index 5b441992c..254b3f391 100644 --- a/src/server/scripts/DragonIsles/BrackenhideHollow/Boss_Treemouth.cpp +++ b/src/server/scripts/DragonIsles/BrackenhideHollow/Boss_Treemouth.cpp @@ -64,7 +64,7 @@ public: instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me, 1); events.ScheduleEvent(EVENT_CONSUME, 6s); events.ScheduleEvent(EVENT_DECAY_SPRAY, 10s); - events.ScheduleEvent(SPELL_VINE_WHIP, 15s); + events.ScheduleEvent(EVENT_VINE_WHIP, 15s); events.ScheduleEvent(EVENT_DECAY_SPRAY_SUMMON, 13s); } @@ -109,11 +109,11 @@ public: break; case SPELL_VINE_WHIP: DoCastVictim(SPELL_VINE_WHIP); - events.ScheduleEvent(SPELL_VINE_WHIP, 15s); + events.ScheduleEvent(EVENT_VINE_WHIP, 15s); break; case EVENT_DECAY_SPRAY_SUMMON: DoCastVictim(SPELL_DECAY_SPRAY_SUMMON); - events.ScheduleEvent(SPELL_DECAY_SPRAY_SUMMON, 13s); + events.ScheduleEvent(EVENT_DECAY_SPRAY_SUMMON, 13s); break; } } diff --git a/src/server/scripts/Midnight/WindrunnerSpire/boss_commander_kroluk.cpp b/src/server/scripts/Midnight/WindrunnerSpire/boss_commander_kroluk.cpp index 761d6b423..398235004 100644 --- a/src/server/scripts/Midnight/WindrunnerSpire/boss_commander_kroluk.cpp +++ b/src/server/scripts/Midnight/WindrunnerSpire/boss_commander_kroluk.cpp @@ -70,6 +70,12 @@ enum CommanderKrolukSpellVisualKits SPELL_VISUAL_KIT_RAMPAGE_ATTACK = 214011, }; +enum events +{ + EVENT_RALLYING_BELLOW = 1, + EVENT_RAMPAGE, +}; + constexpr Position SpectralAxethrowerSpawnPositions = Position{ 5199.316f, -3106.986f, 100.17826f, 2.16934f }; constexpr Position PhantasmalMysticSpawnPositions = Position{ 5231.8403f, -3097.4895f, 100.16755f, 1.17132f }; @@ -93,15 +99,15 @@ struct boss_commander_kroluk : public BossAI { InitNormalPhaseEvents(); - damageEvents.ScheduleEvent(SPELL_RALLYING_BELLOW, 66); - damageEvents.ScheduleEvent(SPELL_RALLYING_BELLOW, 33); + damageEvents.ScheduleEvent(EVENT_RALLYING_BELLOW, 66); + damageEvents.ScheduleEvent(EVENT_RAMPAGE, 33); } void ExecuteEvent(uint32 eventId) override { switch (eventId) { - case SPELL_RAMPAGE: + case EVENT_RAMPAGE: DoCastVictim(SPELL_RAMPAGE); scheduler.Schedule(2s,[this](TaskContext& context) diff --git a/src/server/scripts/Midnight/WindrunnerSpire/boss_derelict_duo.cpp b/src/server/scripts/Midnight/WindrunnerSpire/boss_derelict_duo.cpp index 6d5f4c270..cf0e80fba 100644 --- a/src/server/scripts/Midnight/WindrunnerSpire/boss_derelict_duo.cpp +++ b/src/server/scripts/Midnight/WindrunnerSpire/boss_derelict_duo.cpp @@ -62,6 +62,16 @@ enum DerelictDuoMovements POINT_POST_INTRO_POSITION = 1, }; +enum events +{ + EVENT_KALIS_SHADOW_BOLT = 1, + EVENT_KALIS_CURSE_OF_DARKNESS, + EVENT_KALIS_DEBILITATING_SHRIEK, + EVENT_LATCH_SPLATTERING_SPEW, + EVENT_LATCH_BONE_HACK, + EVENT_LATCH_HEAVY_YANK +}; + constexpr Position LatchFightPosition = { 5043.6562f, -3170.3074f,101.1875f, 0.99163055419921875f }; constexpr Position KalisFightPosition = { 5052.2f, -3175.05f, 100.999f, 0.99163055419921875f }; @@ -122,24 +132,24 @@ struct boss_wrs_kalis : public boss_wrs_derelict_duo_generic void ScheduleTasks() override { - events.ScheduleEvent(SPELL_KALIS_SHADOW_BOLT, 3s); - events.ScheduleEvent(SPELL_KALIS_CURSE_OF_DARKNESS, 22s); - events.ScheduleEvent(SPELL_KALIS_DEBILITATING_SHRIEK, 60s); + events.ScheduleEvent(EVENT_KALIS_SHADOW_BOLT, 3s); + events.ScheduleEvent(EVENT_KALIS_CURSE_OF_DARKNESS, 22s); + events.ScheduleEvent(EVENT_KALIS_DEBILITATING_SHRIEK, 60s); } void ExecuteEvent(uint32 eventId) override { switch (eventId) { - case SPELL_KALIS_SHADOW_BOLT: + case EVENT_KALIS_SHADOW_BOLT: DoCastRandom(SPELL_KALIS_SHADOW_BOLT); events.Repeat(5s); break; - case SPELL_KALIS_CURSE_OF_DARKNESS: + case EVENT_KALIS_CURSE_OF_DARKNESS: DoCastAOE(SPELL_KALIS_CURSE_OF_DARKNESS); DoCastAOE(SPELL_KALIS_CURSE_OF_DARKNESS_SELECT_TARGET); break; - case SPELL_KALIS_DEBILITATING_SHRIEK: + case EVENT_KALIS_DEBILITATING_SHRIEK: { events.Reset(); Position randomPos = me->GetRandomNearPosition(20.f); @@ -202,25 +212,25 @@ struct boss_wrs_latch : public boss_wrs_derelict_duo_generic void ScheduleTasks() override { - events.ScheduleEvent(SPELL_LATCH_SPLATTERING_SPEW, 10s); - events.ScheduleEvent(SPELL_LATCH_BONE_HACK, 15s); - events.ScheduleEvent(SPELL_LATCH_HEAVY_YANK, 60s); + events.ScheduleEvent(EVENT_LATCH_SPLATTERING_SPEW, 10s); + events.ScheduleEvent(EVENT_LATCH_BONE_HACK, 15s); + events.ScheduleEvent(EVENT_LATCH_HEAVY_YANK, 60s); } void ExecuteEvent(uint32 eventId) override { switch (eventId) { - case SPELL_LATCH_SPLATTERING_SPEW: + case EVENT_LATCH_SPLATTERING_SPEW: DoCastAOE(SPELL_LATCH_SPLATTERING_SPEW); DoCastAOE(SPELL_LATCH_SPLATTERING_SPEW_VISUAL, true); events.Repeat(30s); break; - case SPELL_LATCH_BONE_HACK: + case EVENT_LATCH_BONE_HACK: DoCastVictim(SPELL_LATCH_BONE_HACK); events.Repeat(20s); break; - case SPELL_LATCH_HEAVY_YANK: + case EVENT_LATCH_HEAVY_YANK: { if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.f, true)) { diff --git a/src/server/scripts/Spells/spell_mage.cpp b/src/server/scripts/Spells/spell_mage.cpp index f986d669b..9ca816b8f 100644 --- a/src/server/scripts/Spells/spell_mage.cpp +++ b/src/server/scripts/Spells/spell_mage.cpp @@ -2172,7 +2172,7 @@ class aura_mage_clearcasting_proc : public AuraScript return false; } - void HandleProc(AuraEffect* /*aurEff*/, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* /*aurEff*/, ProcEventInfo& /*eventInfo*/) { PreventDefaultAction(); diff --git a/src/server/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp index 2b87a3d77..4e10b4904 100644 --- a/src/server/scripts/Spells/spell_warrior.cpp +++ b/src/server/scripts/Spells/spell_warrior.cpp @@ -2694,7 +2694,7 @@ class spell_warr_indomitable : public AuraScript return _rageAccumulator >= GetEffect(EFFECT_1)->GetAmount(); } - void HandleProc(ProcEventInfo const& eventInfo) + void HandleProc(ProcEventInfo const& /*eventInfo*/) { Unit* target = GetTarget();