*Consistent parameter names of spell effect handlers - use effIndex instead of i or eff_idx or variations of it.
--HG-- branch : trunk
This commit is contained in:
QAston
@@ -4683,7 +4683,7 @@ void Spell::HandleEffects(Unit *pUnitTarget,Item *pItemTarget,GameObject *pGOTar
|
|||||||
|
|
||||||
if (!preventDefault && eff < TOTAL_SPELL_EFFECTS)
|
if (!preventDefault && eff < TOTAL_SPELL_EFFECTS)
|
||||||
{
|
{
|
||||||
(this->*SpellEffects[eff])(i);
|
(this->*SpellEffects[eff])((SpellEffIndex)i);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -6995,16 +6995,16 @@ int32 Spell::CalculateDamageDone(Unit *unit, const uint32 effectMask, float *mul
|
|||||||
switch(m_spellInfo->Effect[i])
|
switch(m_spellInfo->Effect[i])
|
||||||
{
|
{
|
||||||
case SPELL_EFFECT_SCHOOL_DAMAGE:
|
case SPELL_EFFECT_SCHOOL_DAMAGE:
|
||||||
SpellDamageSchoolDmg(i);
|
SpellDamageSchoolDmg((SpellEffIndex)i);
|
||||||
break;
|
break;
|
||||||
case SPELL_EFFECT_WEAPON_DAMAGE:
|
case SPELL_EFFECT_WEAPON_DAMAGE:
|
||||||
case SPELL_EFFECT_WEAPON_DAMAGE_NOSCHOOL:
|
case SPELL_EFFECT_WEAPON_DAMAGE_NOSCHOOL:
|
||||||
case SPELL_EFFECT_NORMALIZED_WEAPON_DMG:
|
case SPELL_EFFECT_NORMALIZED_WEAPON_DMG:
|
||||||
case SPELL_EFFECT_WEAPON_PERCENT_DAMAGE:
|
case SPELL_EFFECT_WEAPON_PERCENT_DAMAGE:
|
||||||
SpellDamageWeaponDmg(i);
|
SpellDamageWeaponDmg((SpellEffIndex)i);
|
||||||
break;
|
break;
|
||||||
case SPELL_EFFECT_HEAL:
|
case SPELL_EFFECT_HEAL:
|
||||||
SpellDamageHeal(i);
|
SpellDamageHeal((SpellEffIndex)i);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+128
-128
@@ -289,130 +289,130 @@ class Spell
|
|||||||
friend class SpellScript;
|
friend class SpellScript;
|
||||||
public:
|
public:
|
||||||
|
|
||||||
void EffectNULL(uint32);
|
void EffectNULL(SpellEffIndex effIndex);
|
||||||
void EffectUnused(uint32);
|
void EffectUnused(SpellEffIndex effIndex);
|
||||||
void EffectDistract(uint32 i);
|
void EffectDistract(SpellEffIndex effIndex);
|
||||||
void EffectPull(uint32 i);
|
void EffectPull(SpellEffIndex effIndex);
|
||||||
void EffectSchoolDMG(uint32 i);
|
void EffectSchoolDMG(SpellEffIndex effIndex);
|
||||||
void EffectEnvirinmentalDMG(uint32 i);
|
void EffectEnvirinmentalDMG(SpellEffIndex effIndex);
|
||||||
void EffectInstaKill(uint32 i);
|
void EffectInstaKill(SpellEffIndex effIndex);
|
||||||
void EffectDummy(uint32 i);
|
void EffectDummy(SpellEffIndex effIndex);
|
||||||
void EffectTeleportUnits(uint32 i);
|
void EffectTeleportUnits(SpellEffIndex effIndex);
|
||||||
void EffectApplyAura(uint32 i);
|
void EffectApplyAura(SpellEffIndex effIndex);
|
||||||
void EffectSendEvent(uint32 i);
|
void EffectSendEvent(SpellEffIndex effIndex);
|
||||||
void EffectPowerBurn(uint32 i);
|
void EffectPowerBurn(SpellEffIndex effIndex);
|
||||||
void EffectPowerDrain(uint32 i);
|
void EffectPowerDrain(SpellEffIndex effIndex);
|
||||||
void EffectHeal(uint32 i);
|
void EffectHeal(SpellEffIndex effIndex);
|
||||||
void EffectBind(uint32 i);
|
void EffectBind(SpellEffIndex effIndex);
|
||||||
void EffectHealthLeech(uint32 i);
|
void EffectHealthLeech(SpellEffIndex effIndex);
|
||||||
void EffectQuestComplete(uint32 i);
|
void EffectQuestComplete(SpellEffIndex effIndex);
|
||||||
void EffectCreateItem(uint32 i);
|
void EffectCreateItem(SpellEffIndex effIndex);
|
||||||
void EffectCreateItem2(uint32 i);
|
void EffectCreateItem2(SpellEffIndex effIndex);
|
||||||
void EffectCreateRandomItem(uint32 i);
|
void EffectCreateRandomItem(SpellEffIndex effIndex);
|
||||||
void EffectPersistentAA(uint32 i);
|
void EffectPersistentAA(SpellEffIndex effIndex);
|
||||||
void EffectEnergize(uint32 i);
|
void EffectEnergize(SpellEffIndex effIndex);
|
||||||
void EffectOpenLock(uint32 i);
|
void EffectOpenLock(SpellEffIndex effIndex);
|
||||||
void EffectSummonChangeItem(uint32 i);
|
void EffectSummonChangeItem(SpellEffIndex effIndex);
|
||||||
void EffectProficiency(uint32 i);
|
void EffectProficiency(SpellEffIndex effIndex);
|
||||||
void EffectApplyAreaAura(uint32 i);
|
void EffectApplyAreaAura(SpellEffIndex effIndex);
|
||||||
void EffectSummonType(uint32 i);
|
void EffectSummonType(SpellEffIndex effIndex);
|
||||||
void EffectLearnSpell(uint32 i);
|
void EffectLearnSpell(SpellEffIndex effIndex);
|
||||||
void EffectDispel(uint32 i);
|
void EffectDispel(SpellEffIndex effIndex);
|
||||||
void EffectDualWield(uint32 i);
|
void EffectDualWield(SpellEffIndex effIndex);
|
||||||
void EffectPickPocket(uint32 i);
|
void EffectPickPocket(SpellEffIndex effIndex);
|
||||||
void EffectAddFarsight(uint32 i);
|
void EffectAddFarsight(SpellEffIndex effIndex);
|
||||||
void EffectHealMechanical(uint32 i);
|
void EffectHealMechanical(SpellEffIndex effIndex);
|
||||||
void EffectJump(uint32 i);
|
void EffectJump(SpellEffIndex effIndex);
|
||||||
void EffectJumpDest(uint32 i);
|
void EffectJumpDest(SpellEffIndex effIndex);
|
||||||
void EffectLeapBack(uint32 i);
|
void EffectLeapBack(SpellEffIndex effIndex);
|
||||||
void EffectQuestClear(uint32 i);
|
void EffectQuestClear(SpellEffIndex effIndex);
|
||||||
void EffectTeleUnitsFaceCaster(uint32 i);
|
void EffectTeleUnitsFaceCaster(SpellEffIndex effIndex);
|
||||||
void EffectLearnSkill(uint32 i);
|
void EffectLearnSkill(SpellEffIndex effIndex);
|
||||||
void EffectAddHonor(uint32 i);
|
void EffectAddHonor(SpellEffIndex effIndex);
|
||||||
void EffectTradeSkill(uint32 i);
|
void EffectTradeSkill(SpellEffIndex effIndex);
|
||||||
void EffectEnchantItemPerm(uint32 i);
|
void EffectEnchantItemPerm(SpellEffIndex effIndex);
|
||||||
void EffectEnchantItemTmp(uint32 i);
|
void EffectEnchantItemTmp(SpellEffIndex effIndex);
|
||||||
void EffectTameCreature(uint32 i);
|
void EffectTameCreature(SpellEffIndex effIndex);
|
||||||
void EffectSummonPet(uint32 i);
|
void EffectSummonPet(SpellEffIndex effIndex);
|
||||||
void EffectLearnPetSpell(uint32 i);
|
void EffectLearnPetSpell(SpellEffIndex effIndex);
|
||||||
void EffectWeaponDmg(uint32 i);
|
void EffectWeaponDmg(SpellEffIndex effIndex);
|
||||||
void EffectForceCast(uint32 i);
|
void EffectForceCast(SpellEffIndex effIndex);
|
||||||
void EffectForceCastWithValue(uint32 i);
|
void EffectForceCastWithValue(SpellEffIndex effIndex);
|
||||||
void EffectTriggerSpell(uint32 i);
|
void EffectTriggerSpell(SpellEffIndex effIndex);
|
||||||
void EffectTriggerMissileSpell(uint32 i);
|
void EffectTriggerMissileSpell(SpellEffIndex effIndex);
|
||||||
void EffectThreat(uint32 i);
|
void EffectThreat(SpellEffIndex effIndex);
|
||||||
void EffectHealMaxHealth(uint32 i);
|
void EffectHealMaxHealth(SpellEffIndex effIndex);
|
||||||
void EffectInterruptCast(uint32 i);
|
void EffectInterruptCast(SpellEffIndex effIndex);
|
||||||
void EffectSummonObjectWild(uint32 i);
|
void EffectSummonObjectWild(SpellEffIndex effIndex);
|
||||||
void EffectScriptEffect(uint32 i);
|
void EffectScriptEffect(SpellEffIndex effIndex);
|
||||||
void EffectSanctuary(uint32 i);
|
void EffectSanctuary(SpellEffIndex effIndex);
|
||||||
void EffectAddComboPoints(uint32 i);
|
void EffectAddComboPoints(SpellEffIndex effIndex);
|
||||||
void EffectDuel(uint32 i);
|
void EffectDuel(SpellEffIndex effIndex);
|
||||||
void EffectStuck(uint32 i);
|
void EffectStuck(SpellEffIndex effIndex);
|
||||||
void EffectSummonPlayer(uint32 i);
|
void EffectSummonPlayer(SpellEffIndex effIndex);
|
||||||
void EffectActivateObject(uint32 i);
|
void EffectActivateObject(SpellEffIndex effIndex);
|
||||||
void EffectApplyGlyph(uint32 i);
|
void EffectApplyGlyph(SpellEffIndex effIndex);
|
||||||
void EffectEnchantHeldItem(uint32 i);
|
void EffectEnchantHeldItem(SpellEffIndex effIndex);
|
||||||
void EffectSummonObject(uint32 i);
|
void EffectSummonObject(SpellEffIndex effIndex);
|
||||||
void EffectResurrect(uint32 i);
|
void EffectResurrect(SpellEffIndex effIndex);
|
||||||
void EffectParry(uint32 i);
|
void EffectParry(SpellEffIndex effIndex);
|
||||||
void EffectBlock(uint32 i);
|
void EffectBlock(SpellEffIndex effIndex);
|
||||||
void EffectLeap(uint32 i);
|
void EffectLeap(SpellEffIndex effIndex);
|
||||||
void EffectTransmitted(uint32 i);
|
void EffectTransmitted(SpellEffIndex effIndex);
|
||||||
void EffectDisEnchant(uint32 i);
|
void EffectDisEnchant(SpellEffIndex effIndex);
|
||||||
void EffectInebriate(uint32 i);
|
void EffectInebriate(SpellEffIndex effIndex);
|
||||||
void EffectFeedPet(uint32 i);
|
void EffectFeedPet(SpellEffIndex effIndex);
|
||||||
void EffectDismissPet(uint32 i);
|
void EffectDismissPet(SpellEffIndex effIndex);
|
||||||
void EffectReputation(uint32 i);
|
void EffectReputation(SpellEffIndex effIndex);
|
||||||
void EffectForceDeselect(uint32 i);
|
void EffectForceDeselect(SpellEffIndex effIndex);
|
||||||
void EffectSelfResurrect(uint32 i);
|
void EffectSelfResurrect(SpellEffIndex effIndex);
|
||||||
void EffectSkinning(uint32 i);
|
void EffectSkinning(SpellEffIndex effIndex);
|
||||||
void EffectCharge(uint32 i);
|
void EffectCharge(SpellEffIndex effIndex);
|
||||||
void EffectChargeDest(uint32 i);
|
void EffectChargeDest(SpellEffIndex effIndex);
|
||||||
void EffectProspecting(uint32 i);
|
void EffectProspecting(SpellEffIndex effIndex);
|
||||||
void EffectMilling(uint32 i);
|
void EffectMilling(SpellEffIndex effIndex);
|
||||||
void EffectRenamePet(uint32 i);
|
void EffectRenamePet(SpellEffIndex effIndex);
|
||||||
void EffectSendTaxi(uint32 i);
|
void EffectSendTaxi(SpellEffIndex effIndex);
|
||||||
void EffectSummonCritter(uint32 i);
|
void EffectSummonCritter(SpellEffIndex effIndex);
|
||||||
void EffectKnockBack(uint32 i);
|
void EffectKnockBack(SpellEffIndex effIndex);
|
||||||
void EffectPullTowards(uint32 i);
|
void EffectPullTowards(SpellEffIndex effIndex);
|
||||||
void EffectDispelMechanic(uint32 i);
|
void EffectDispelMechanic(SpellEffIndex effIndex);
|
||||||
void EffectSummonDeadPet(uint32 i);
|
void EffectSummonDeadPet(SpellEffIndex effIndex);
|
||||||
void EffectDestroyAllTotems(uint32 i);
|
void EffectDestroyAllTotems(SpellEffIndex effIndex);
|
||||||
void EffectDurabilityDamage(uint32 i);
|
void EffectDurabilityDamage(SpellEffIndex effIndex);
|
||||||
void EffectSkill(uint32 i);
|
void EffectSkill(SpellEffIndex effIndex);
|
||||||
void EffectTaunt(uint32 i);
|
void EffectTaunt(SpellEffIndex effIndex);
|
||||||
void EffectDurabilityDamagePCT(uint32 i);
|
void EffectDurabilityDamagePCT(SpellEffIndex effIndex);
|
||||||
void EffectModifyThreatPercent(uint32 i);
|
void EffectModifyThreatPercent(SpellEffIndex effIndex);
|
||||||
void EffectResurrectNew(uint32 i);
|
void EffectResurrectNew(SpellEffIndex effIndex);
|
||||||
void EffectAddExtraAttacks(uint32 i);
|
void EffectAddExtraAttacks(SpellEffIndex effIndex);
|
||||||
void EffectSpiritHeal(uint32 i);
|
void EffectSpiritHeal(SpellEffIndex effIndex);
|
||||||
void EffectSkinPlayerCorpse(uint32 i);
|
void EffectSkinPlayerCorpse(SpellEffIndex effIndex);
|
||||||
void EffectStealBeneficialBuff(uint32 i);
|
void EffectStealBeneficialBuff(SpellEffIndex effIndex);
|
||||||
void EffectUnlearnSpecialization(uint32 i);
|
void EffectUnlearnSpecialization(SpellEffIndex effIndex);
|
||||||
void EffectHealPct(uint32 i);
|
void EffectHealPct(SpellEffIndex effIndex);
|
||||||
void EffectEnergizePct(uint32 i);
|
void EffectEnergizePct(SpellEffIndex effIndex);
|
||||||
void EffectTriggerSpellWithValue(uint32 i);
|
void EffectTriggerSpellWithValue(SpellEffIndex effIndex);
|
||||||
void EffectTriggerRitualOfSummoning(uint32 i);
|
void EffectTriggerRitualOfSummoning(SpellEffIndex effIndex);
|
||||||
void EffectKillCreditPersonal(uint32 i);
|
void EffectKillCreditPersonal(SpellEffIndex effIndex);
|
||||||
void EffectKillCredit(uint32 i);
|
void EffectKillCredit(SpellEffIndex effIndex);
|
||||||
void EffectQuestFail(uint32 i);
|
void EffectQuestFail(SpellEffIndex effIndex);
|
||||||
void EffectQuestStart(uint32 i);
|
void EffectQuestStart(SpellEffIndex effIndex);
|
||||||
void EffectRedirectThreat(uint32 i);
|
void EffectRedirectThreat(SpellEffIndex effIndex);
|
||||||
void EffectWMODamage(uint32 i);
|
void EffectWMODamage(SpellEffIndex effIndex);
|
||||||
void EffectWMORepair(uint32 i);
|
void EffectWMORepair(SpellEffIndex effIndex);
|
||||||
void EffectActivateRune(uint32 i);
|
void EffectActivateRune(SpellEffIndex effIndex);
|
||||||
void EffectCreateTamedPet(uint32 i);
|
void EffectCreateTamedPet(SpellEffIndex effIndex);
|
||||||
void EffectDiscoverTaxi(uint32 i);
|
void EffectDiscoverTaxi(SpellEffIndex effIndex);
|
||||||
void EffectTitanGrip(uint32 i);
|
void EffectTitanGrip(SpellEffIndex effIndex);
|
||||||
void EffectEnchantItemPrismatic(uint32 i);
|
void EffectEnchantItemPrismatic(SpellEffIndex effIndex);
|
||||||
void EffectPlayMusic(uint32 i);
|
void EffectPlayMusic(SpellEffIndex effIndex);
|
||||||
void EffectSpecCount(uint32 i);
|
void EffectSpecCount(SpellEffIndex effIndex);
|
||||||
void EffectActivateSpec(uint32 i);
|
void EffectActivateSpec(SpellEffIndex effIndex);
|
||||||
void EffectPlayerNotification(uint32 i);
|
void EffectPlayerNotification(SpellEffIndex effIndex);
|
||||||
void EffectRemoveAura(uint32 i);
|
void EffectRemoveAura(SpellEffIndex effIndex);
|
||||||
void EffectCastButtons(uint32 i);
|
void EffectCastButtons(SpellEffIndex effIndex);
|
||||||
void EffectRechargeManaGem(uint32 i);
|
void EffectRechargeManaGem(SpellEffIndex effIndex);
|
||||||
|
|
||||||
typedef std::set<Aura *> UsedSpellMods;
|
typedef std::set<Aura *> UsedSpellMods;
|
||||||
|
|
||||||
@@ -668,9 +668,9 @@ class Spell
|
|||||||
bool IsValidSingleTargetSpell(Unit const* target) const;
|
bool IsValidSingleTargetSpell(Unit const* target) const;
|
||||||
void CalculateDamageDoneForAllTargets();
|
void CalculateDamageDoneForAllTargets();
|
||||||
int32 CalculateDamageDone(Unit *unit, const uint32 effectMask, float *multiplier);
|
int32 CalculateDamageDone(Unit *unit, const uint32 effectMask, float *multiplier);
|
||||||
void SpellDamageSchoolDmg(uint32 i);
|
void SpellDamageSchoolDmg(SpellEffIndex effIndex);
|
||||||
void SpellDamageWeaponDmg(uint32 i);
|
void SpellDamageWeaponDmg(SpellEffIndex effIndex);
|
||||||
void SpellDamageHeal(uint32 i);
|
void SpellDamageHeal(SpellEffIndex effIndex);
|
||||||
|
|
||||||
void PrepareTargetProcessing();
|
void PrepareTargetProcessing();
|
||||||
void FinishTargetProcessing();
|
void FinishTargetProcessing();
|
||||||
@@ -832,7 +832,7 @@ namespace Trinity
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
typedef void(Spell::*pEffect)(uint32 i);
|
typedef void(Spell::*pEffect)(SpellEffIndex effIndex);
|
||||||
|
|
||||||
class SpellEvent : public BasicEvent
|
class SpellEvent : public BasicEvent
|
||||||
{
|
{
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user