aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorclick <none@none>2010-12-25 06:28:38 +0100
committerclick <none@none>2010-12-25 06:28:38 +0100
commitb181ba21d9d6c7c9514b265f43bbe098d8a4f284 (patch)
tree5fc8a8c23bbb040adaad7313726453f2d9db81a6 /src
parent26973154768c2af2ff708b7330aa9d4a5e7fb071 (diff)
Core: Fix a few warnings here and there.
--HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/server/game/DungeonFinding/LFGScripts.cpp4
-rwxr-xr-xsrc/server/game/Entities/Unit/Unit.cpp4
-rwxr-xr-xsrc/server/game/Spells/Auras/SpellAuraEffects.cpp2
-rwxr-xr-xsrc/server/game/Spells/SpellEffects.cpp2
-rw-r--r--src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp2
5 files changed, 9 insertions, 5 deletions
diff --git a/src/server/game/DungeonFinding/LFGScripts.cpp b/src/server/game/DungeonFinding/LFGScripts.cpp
index 12ce142a292..fdf9ff1bf92 100644
--- a/src/server/game/DungeonFinding/LFGScripts.cpp
+++ b/src/server/game/DungeonFinding/LFGScripts.cpp
@@ -164,9 +164,9 @@ void LFGScripts::OnLogin(Player* player)
// TODO - Restore LfgPlayerData and send proper status to player if it was in a group
}
-void LFGScripts::OnBindToInstance(Player* player, Difficulty difficulty, uint32 mapId, bool permanent)
+void LFGScripts::OnBindToInstance(Player* player, Difficulty difficulty, uint32 mapId, bool /*permanent*/)
{
MapEntry const* mapEntry = sMapStore.LookupEntry(mapId);
if (mapEntry->IsDungeon() && difficulty > DUNGEON_DIFFICULTY_NORMAL)
sLFGMgr->InitializeLockedDungeons(player);
-} \ No newline at end of file
+}
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index a862b0f03f0..72abb394bf6 100755
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -10327,6 +10327,7 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3
AuraEffectList const &mModDamagePercentDone = GetAuraEffectsByType(SPELL_AURA_MOD_DAMAGE_PERCENT_DONE);
for (AuraEffectList::const_iterator i = mModDamagePercentDone.begin(); i != mModDamagePercentDone.end(); ++i)
if ((*i)->GetMiscValue() & GetSpellSchoolMask(spellProto))
+ {
if ((*i)->GetSpellProto()->EquippedItemClass == -1)
{
AddPctN(DoneTotalMod, (*i)->GetAmount());
@@ -10340,6 +10341,7 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3
}
else if (ToPlayer() && ToPlayer()->HasItemFitToSpellRequirements((*i)->GetSpellProto()))
AddPctN(DoneTotalMod, (*i)->GetAmount());
+ }
}
uint32 creatureTypeMask = pVictim->GetCreatureTypeMask();
@@ -11632,6 +11634,7 @@ void Unit::MeleeDamageBonus(Unit *pVictim, uint32 *pdamage, WeaponAttackType att
AuraEffectList const &mModDamagePercentDone = GetAuraEffectsByType(SPELL_AURA_MOD_DAMAGE_PERCENT_DONE);
for (AuraEffectList::const_iterator i = mModDamagePercentDone.begin(); i != mModDamagePercentDone.end(); ++i)
if ((*i)->GetMiscValue() & GetSpellSchoolMask(spellProto))
+ {
if ((*i)->GetSpellProto()->EquippedItemClass == -1)
{
AddPctN(DoneTotalMod, (*i)->GetAmount());
@@ -11645,6 +11648,7 @@ void Unit::MeleeDamageBonus(Unit *pVictim, uint32 *pdamage, WeaponAttackType att
}
else if (ToPlayer() && ToPlayer()->HasItemFitToSpellRequirements((*i)->GetSpellProto()))
AddPctN(DoneTotalMod, (*i)->GetAmount());
+ }
}
else if (ToPlayer())
{
diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
index 1026f3dc417..fda52029f3a 100755
--- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
@@ -5442,7 +5442,7 @@ void AuraEffect::HandleModDamageDone(AuraApplication const * aurApp, uint8 mode,
}
}
-void AuraEffect::HandleModDamagePercentDone(AuraApplication const * aurApp, uint8 mode, bool apply) const
+void AuraEffect::HandleModDamagePercentDone(AuraApplication const * /*aurApp*/, uint8 mode, bool /*apply*/) const
{
if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT)))
return;
diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp
index ec171acc023..b738be64465 100755
--- a/src/server/game/Spells/SpellEffects.cpp
+++ b/src/server/game/Spells/SpellEffects.cpp
@@ -3318,7 +3318,7 @@ void Spell::EffectAddFarsight(SpellEffIndex effIndex)
//m_caster->ToPlayer()->UpdateVisibilityOf(dynObj);
}
-void Spell::EffectUntrainTalents(SpellEffIndex effIndex)
+void Spell::EffectUntrainTalents(SpellEffIndex /*effIndex*/)
{
if (!unitTarget || m_caster->GetTypeId() == TYPEID_PLAYER)
return;
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp
index cb1a30a9254..dec9b8573c3 100644
--- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp
@@ -159,7 +159,7 @@ void RespawnEncounter(InstanceScript* pInstance, Creature* me)
}
}
-void StartEncounter(InstanceScript* pInstance, Creature* me, Unit* target)
+void StartEncounter(InstanceScript* pInstance, Creature* me, Unit* /*target*/)
{
if (pInstance->GetBossState(TYPE_ASSEMBLY) == IN_PROGRESS)
return; // Prevent recursive calls