Core: Fix a few warnings here and there.

--HG--
branch : trunk
This commit is contained in:
click
2010-12-25 06:28:38 +01:00
parent 2697315476
commit b181ba21d9
5 changed files with 9 additions and 5 deletions
@@ -164,7 +164,7 @@ void LFGScripts::OnLogin(Player* player)
// TODO - Restore LfgPlayerData and send proper status to player if it was in a group // 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); MapEntry const* mapEntry = sMapStore.LookupEntry(mapId);
if (mapEntry->IsDungeon() && difficulty > DUNGEON_DIFFICULTY_NORMAL) if (mapEntry->IsDungeon() && difficulty > DUNGEON_DIFFICULTY_NORMAL)
+4
View File
@@ -10327,6 +10327,7 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3
AuraEffectList const &mModDamagePercentDone = GetAuraEffectsByType(SPELL_AURA_MOD_DAMAGE_PERCENT_DONE); AuraEffectList const &mModDamagePercentDone = GetAuraEffectsByType(SPELL_AURA_MOD_DAMAGE_PERCENT_DONE);
for (AuraEffectList::const_iterator i = mModDamagePercentDone.begin(); i != mModDamagePercentDone.end(); ++i) for (AuraEffectList::const_iterator i = mModDamagePercentDone.begin(); i != mModDamagePercentDone.end(); ++i)
if ((*i)->GetMiscValue() & GetSpellSchoolMask(spellProto)) if ((*i)->GetMiscValue() & GetSpellSchoolMask(spellProto))
{
if ((*i)->GetSpellProto()->EquippedItemClass == -1) if ((*i)->GetSpellProto()->EquippedItemClass == -1)
{ {
AddPctN(DoneTotalMod, (*i)->GetAmount()); AddPctN(DoneTotalMod, (*i)->GetAmount());
@@ -10340,6 +10341,7 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3
} }
else if (ToPlayer() && ToPlayer()->HasItemFitToSpellRequirements((*i)->GetSpellProto())) else if (ToPlayer() && ToPlayer()->HasItemFitToSpellRequirements((*i)->GetSpellProto()))
AddPctN(DoneTotalMod, (*i)->GetAmount()); AddPctN(DoneTotalMod, (*i)->GetAmount());
}
} }
uint32 creatureTypeMask = pVictim->GetCreatureTypeMask(); 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); AuraEffectList const &mModDamagePercentDone = GetAuraEffectsByType(SPELL_AURA_MOD_DAMAGE_PERCENT_DONE);
for (AuraEffectList::const_iterator i = mModDamagePercentDone.begin(); i != mModDamagePercentDone.end(); ++i) for (AuraEffectList::const_iterator i = mModDamagePercentDone.begin(); i != mModDamagePercentDone.end(); ++i)
if ((*i)->GetMiscValue() & GetSpellSchoolMask(spellProto)) if ((*i)->GetMiscValue() & GetSpellSchoolMask(spellProto))
{
if ((*i)->GetSpellProto()->EquippedItemClass == -1) if ((*i)->GetSpellProto()->EquippedItemClass == -1)
{ {
AddPctN(DoneTotalMod, (*i)->GetAmount()); AddPctN(DoneTotalMod, (*i)->GetAmount());
@@ -11645,6 +11648,7 @@ void Unit::MeleeDamageBonus(Unit *pVictim, uint32 *pdamage, WeaponAttackType att
} }
else if (ToPlayer() && ToPlayer()->HasItemFitToSpellRequirements((*i)->GetSpellProto())) else if (ToPlayer() && ToPlayer()->HasItemFitToSpellRequirements((*i)->GetSpellProto()))
AddPctN(DoneTotalMod, (*i)->GetAmount()); AddPctN(DoneTotalMod, (*i)->GetAmount());
}
} }
else if (ToPlayer()) else if (ToPlayer())
{ {
@@ -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))) if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT)))
return; return;
+1 -1
View File
@@ -3318,7 +3318,7 @@ void Spell::EffectAddFarsight(SpellEffIndex effIndex)
//m_caster->ToPlayer()->UpdateVisibilityOf(dynObj); //m_caster->ToPlayer()->UpdateVisibilityOf(dynObj);
} }
void Spell::EffectUntrainTalents(SpellEffIndex effIndex) void Spell::EffectUntrainTalents(SpellEffIndex /*effIndex*/)
{ {
if (!unitTarget || m_caster->GetTypeId() == TYPEID_PLAYER) if (!unitTarget || m_caster->GetTypeId() == TYPEID_PLAYER)
return; return;
@@ -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) if (pInstance->GetBossState(TYPE_ASSEMBLY) == IN_PROGRESS)
return; // Prevent recursive calls return; // Prevent recursive calls