Core: Remove lots warnings:
- All "'xxx' will be initialized after 'yyy' when initialized here" - Some "unused variable" - Some "enumeration value 'xxx' not handled in switch" --HG-- branch : trunk
This commit is contained in:
@@ -373,10 +373,11 @@ pAuraEffectHandler AuraEffectHandler[TOTAL_AURAS]=
|
||||
&AuraEffect::HandleNoImmediateEffect, //316 SPELL_AURA_PERIODIC_HASTE implemented in AuraEffect::CalculatePeriodic
|
||||
};
|
||||
|
||||
AuraEffect::AuraEffect(Aura * base, uint8 effIndex, int32 *baseAmount, Unit * caster) :
|
||||
m_base(base), m_spellProto(base->GetSpellProto()), m_spellmod(NULL), m_periodicTimer(0),
|
||||
m_tickNumber(0), m_effIndex(effIndex), m_isPeriodic(false), m_canBeRecalculated(true),
|
||||
m_baseAmount (baseAmount ? *baseAmount : m_spellProto->EffectBasePoints[m_effIndex])
|
||||
AuraEffect::AuraEffect(Aura * base, uint8 effIndex, int32 *baseAmount, Unit * caster):
|
||||
m_base(base), m_spellProto(base->GetSpellProto()), m_effIndex(effIndex),
|
||||
m_baseAmount(baseAmount ? *baseAmount : m_spellProto->EffectBasePoints[m_effIndex]),
|
||||
m_canBeRecalculated(true), m_spellmod(NULL), m_isPeriodic(false),
|
||||
m_periodicTimer(0), m_tickNumber(0)
|
||||
{
|
||||
CalculatePeriodic(caster, true);
|
||||
|
||||
@@ -541,6 +542,8 @@ int32 AuraEffect::CalculateAmount(Unit * caster)
|
||||
DoneActualBenefit = caster->SpellBaseHealingBonus(GetSpellSchoolMask(m_spellProto)) * 0.75f;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case SPELL_AURA_MANA_SHIELD:
|
||||
@@ -725,6 +728,9 @@ int32 AuraEffect::CalculateAmount(Unit * caster)
|
||||
// Dash - do not set speed if not in cat form
|
||||
if (GetSpellProto()->SpellFamilyName == SPELLFAMILY_DRUID && GetSpellProto()->SpellFamilyFlags[2] & 0x00000008)
|
||||
amount = GetBase()->GetUnitOwner()->m_form == FORM_CAT ? amount : 0;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
if (DoneActualBenefit != 0.0f)
|
||||
{
|
||||
@@ -777,6 +783,8 @@ void AuraEffect::CalculatePeriodic(Unit * caster, bool create)
|
||||
m_amplitude *= IN_MILLISECONDS;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
if (!m_isPeriodic)
|
||||
@@ -858,6 +866,8 @@ void AuraEffect::CalculateSpellMod()
|
||||
break;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
case SPELL_AURA_PROC_TRIGGER_SPELL:
|
||||
switch(GetId())
|
||||
@@ -875,6 +885,8 @@ void AuraEffect::CalculateSpellMod()
|
||||
}
|
||||
m_spellmod->value = GetBase()->GetUnitOwner()->CalculateSpellDamage(GetBase()->GetUnitOwner(), GetSpellProto(), 1);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case SPELL_AURA_ADD_FLAT_MODIFIER:
|
||||
@@ -892,6 +904,8 @@ void AuraEffect::CalculateSpellMod()
|
||||
}
|
||||
m_spellmod->value = GetAmount();
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1043,6 +1057,8 @@ void AuraEffect::UpdatePeriodic(Unit * caster)
|
||||
if (m_tickNumber % 11 == 0)
|
||||
SetAmount(GetAmount() * 2);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case SPELL_AURA_DUMMY:
|
||||
@@ -1158,6 +1174,8 @@ void AuraEffect::UpdatePeriodic(Unit * caster)
|
||||
slow->ChangeAmount(newAmount);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case SPELLFAMILY_MAGE:
|
||||
@@ -1178,7 +1196,12 @@ void AuraEffect::UpdatePeriodic(Unit * caster)
|
||||
}
|
||||
return;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1804,6 +1827,8 @@ void AuraEffect::PeriodicTick(Unit * target, Unit * caster) const
|
||||
case SPELL_AURA_PERIODIC_TRIGGER_SPELL_WITH_VALUE:
|
||||
TriggerSpellWithValue(target, caster);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2061,6 +2086,8 @@ void AuraEffect::PeriodicDummyTick(Unit * target, Unit * caster) const
|
||||
target->ToPlayer()->RemoveRunesByAuraEffect(this);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2312,6 +2339,8 @@ void AuraEffect::TriggerSpell(Unit * target, Unit * caster) const
|
||||
}
|
||||
break;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
// Reget trigger spell proto
|
||||
@@ -2499,6 +2528,8 @@ void AuraEffect::HandleShapeshiftBoosts(Unit * target, bool apply) const
|
||||
case FORM_CREATURECAT:
|
||||
case FORM_CREATUREBEAR:
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
if (apply)
|
||||
|
||||
Reference in New Issue
Block a user