diff options
Diffstat (limited to 'src/server/scripts')
9 files changed, 17 insertions, 16 deletions
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_golemagg.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_golemagg.cpp index a0daf31531c..0c99d9db93c 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_golemagg.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_golemagg.cpp @@ -139,7 +139,7 @@ class mob_core_rager : public CreatureScript mangleTimer = 7*IN_MILLISECONDS; // These times are probably wrong } - void DamageTaken(Unit* /*attacker*/, uint32& damage) + void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) { if (HealthAbovePct(50) || !instance) return; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp index e2ea299e66a..113dfe97347 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp @@ -126,8 +126,8 @@ struct boss_twin_baseAI : public ScriptedAI uint32 m_uiTouchTimer; uint32 m_uiBerserkTimer; - uint32 m_uiVortexSay; - uint32 m_uiVortexEmote; + int32 m_uiVortexSay; + int32 m_uiVortexEmote; uint32 m_uiSisterNpcId; uint32 m_uiColorballNpcId; uint32 m_uiEssenceNpcId; 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 3b1da155938..1e5933ecfbe 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp @@ -284,7 +284,7 @@ class spell_trash_mob_glacial_strike : public SpellScriptLoader { PrepareAuraScript(spell_trash_mob_glacial_strike_AuraScript); - void PeriodicTick(AuraEffect const* aurEff) + void PeriodicTick(AuraEffect const* /*aurEff*/) { if (GetTarget()->IsFullHealth()) { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp index 66e5d9264b4..737d530d4cc 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -781,7 +781,7 @@ class npc_rimefang : public CreatureScript break; case EVENT_ICY_BLAST: { - icyBlastCounter = RAID_MODE<uint32>(5, 7, 6, 8); + icyBlastCounter = RAID_MODE<uint8>(5, 7, 6, 8); me->SetReactState(REACT_PASSIVE); me->AttackStop(); me->SetFlying(true); @@ -1391,7 +1391,7 @@ class spell_frostwarden_handler_focus_fire : public SpellScriptLoader { PrepareAuraScript(spell_frostwarden_handler_focus_fire_AuraScript); - void PeriodicTick(AuraEffect const* aurEff) + void PeriodicTick(AuraEffect const* /*aurEff*/) { PreventDefaultAction(); if (Unit* caster = GetCaster()) diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp index badbbcc5ac4..4ef35aaa1d8 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp @@ -300,7 +300,7 @@ class spell_icc_harvest_blight_specimen : public SpellScriptLoader GetHitUnit()->RemoveAurasDueToSpell(uint32(GetEffectValue())); } - void HandleQuestComplete(SpellEffIndex effIndex) + void HandleQuestComplete(SpellEffIndex /*effIndex*/) { GetHitUnit()->RemoveAurasDueToSpell(uint32(GetEffectValue())); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h index 46266551b69..845f975dc87 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h @@ -286,7 +286,7 @@ enum SharedActions // Sindragosa ACTION_START_FROSTWYRM = -368530, - ACTION_TRIGGER_ASPHYXIATION = -368531, + ACTION_TRIGGER_ASPHYXIATION = 368531, }; // Declaration diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp index 4991c117c00..a8f4d237306 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp @@ -117,7 +117,7 @@ class boss_kologarn : public CreatureScript bool left, right; uint64 eyebeamTarget; - void EnterCombat(Unit * who) + void EnterCombat(Unit* /*who*/) { DoScriptText(SAY_AGGRO, me); @@ -156,7 +156,7 @@ class boss_kologarn : public CreatureScript DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); } - void PassengerBoarded(Unit *who, int8 seatId, bool apply) + void PassengerBoarded(Unit* who, int8 /*seatId*/, bool apply) { bool isEncounterInProgress = instance->GetBossState(TYPE_KOLOGARN) == IN_PROGRESS; if (who->GetEntry() == NPC_LEFT_ARM) @@ -549,7 +549,7 @@ class spell_ulduar_stone_grip_absorb : public SpellScriptLoader //! This will be called when Right Arm (vehicle) has sustained a specific amount of damage depending on instance mode //! What we do here is remove all harmful aura's related and teleport to safe spot. - void OnRemove(AuraEffect const* aurEff, AuraEffectHandleModes mode) + void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes mode) { if (!(mode & AURA_EFFECT_HANDLE_REAL)) return; @@ -596,7 +596,7 @@ class spell_ulduar_stone_grip : public SpellScriptLoader pOwner->RemoveAurasDueToSpell(aurEff->GetAmount()); } - void OnRemoveVehicle(AuraEffect const* aurEff, AuraEffectHandleModes mode) + void OnRemoveVehicle(AuraEffect const* /*aurEff*/, AuraEffectHandleModes mode) { if (!(mode & AURA_EFFECT_HANDLE_REAL)) return; diff --git a/src/server/scripts/Northrend/storm_peaks.cpp b/src/server/scripts/Northrend/storm_peaks.cpp index 1b1e4f06939..a8575d72ee7 100644 --- a/src/server/scripts/Northrend/storm_peaks.cpp +++ b/src/server/scripts/Northrend/storm_peaks.cpp @@ -674,8 +674,8 @@ public: { npc_icefangAI(Creature* creature) : npc_escortAI(creature) {} - void AttackStart(Unit* who) {} - void EnterCombat(Unit* who) {} + void AttackStart(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void EnterEvadeMode() {} void PassengerBoarded(Unit* who, int8 /*seatId*/, bool apply) @@ -687,11 +687,11 @@ public: } } - void WaypointReached(uint32 wp) + void WaypointReached(uint32 /*wp*/) { } - void JustDied(Unit* killer) + void JustDied(Unit* /*killer*/) { } diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index 1395625c975..3ddd5af6ed1 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -828,6 +828,7 @@ class spell_item_create_heart_candy : public SpellScriptLoader void HandleScript(SpellEffIndex effIndex) { + PreventHitDefaultEffect(effIndex); if (!GetHitUnit() || !GetHitUnit()->ToPlayer()) return; |