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