Core/Spells: Cleanup in ca5c939a89

This commit is contained in:
Vincent-Michael
2015-04-18 18:09:13 +02:00
parent d74e0d823d
commit a1fe3cccd8
2 changed files with 27 additions and 27 deletions

View File

@@ -4125,7 +4125,7 @@ void Spell::SendSpellExecuteLog()
m_caster->SendMessageToSet(spellExecuteLog.Write(), true);
}
void Spell::ExecuteLogEffectTakeTargetPower(int32 effect, Unit* target, uint32 powerType, uint32 points, float amplitude)
void Spell::ExecuteLogEffectTakeTargetPower(uint8 effIndex, Unit* target, uint32 powerType, uint32 points, float amplitude)
{
SpellLogEffectPowerDrainParams spellLogEffectPowerDrainParams;
@@ -4134,19 +4134,19 @@ void Spell::ExecuteLogEffectTakeTargetPower(int32 effect, Unit* target, uint32 p
spellLogEffectPowerDrainParams.PowerType = powerType;
spellLogEffectPowerDrainParams.Amplitude = amplitude;
_powerDrainTargets[effect].push_back(spellLogEffectPowerDrainParams);
_powerDrainTargets[effIndex].push_back(spellLogEffectPowerDrainParams);
}
void Spell::ExecuteLogEffectExtraAttacks(uint8 effect, Unit* victim, uint32 numAttacks)
void Spell::ExecuteLogEffectExtraAttacks(uint8 effIndex, Unit* victim, uint32 numAttacks)
{
SpellLogEffectExtraAttacksParams spellLogEffectExtraAttacksParams;
spellLogEffectExtraAttacksParams.Victim = victim->GetGUID();
spellLogEffectExtraAttacksParams.NumAttacks = numAttacks;
_extraAttacksTargets[effect].push_back(spellLogEffectExtraAttacksParams);
_extraAttacksTargets[effIndex].push_back(spellLogEffectExtraAttacksParams);
}
void Spell::ExecuteLogEffectInterruptCast(uint8 /*effect*/, Unit* victim, uint32 spellId)
void Spell::ExecuteLogEffectInterruptCast(uint8 /*effIndex*/, Unit* victim, uint32 spellId)
{
ObjectGuid casterGuid = m_caster->GetGUID();
ObjectGuid targetGuid = victim->GetGUID();
@@ -4191,54 +4191,54 @@ void Spell::ExecuteLogEffectInterruptCast(uint8 /*effect*/, Unit* victim, uint32
m_caster->SendMessageToSet(&data, true);
}
void Spell::ExecuteLogEffectDurabilityDamage(uint8 effect, Unit* victim, int32 itemId, int32 amount)
void Spell::ExecuteLogEffectDurabilityDamage(uint8 effIndex, Unit* victim, int32 itemId, int32 amount)
{
SpellLogEffectDurabilityDamageParams spellLogEffectDurabilityDamageParams;
spellLogEffectDurabilityDamageParams.Victim = victim->GetGUID();
spellLogEffectDurabilityDamageParams.ItemID = itemId;
spellLogEffectDurabilityDamageParams.Amount = amount;
_durabilityDamageTargets[effect].push_back(spellLogEffectDurabilityDamageParams);
_durabilityDamageTargets[effIndex].push_back(spellLogEffectDurabilityDamageParams);
}
void Spell::ExecuteLogEffectOpenLock(uint8 effect, Object* obj)
void Spell::ExecuteLogEffectOpenLock(uint8 effIndex, Object* obj)
{
SpellLogEffectGenericVictimParams spellLogEffectGenericVictimParams;
spellLogEffectGenericVictimParams.Victim = obj->GetGUID();
_genericVictimTargets[effect].push_back(spellLogEffectGenericVictimParams);
_genericVictimTargets[effIndex].push_back(spellLogEffectGenericVictimParams);
}
void Spell::ExecuteLogEffectCreateItem(uint8 effect, uint32 entry)
void Spell::ExecuteLogEffectCreateItem(uint8 effIndex, uint32 entry)
{
SpellLogEffectTradeSkillItemParams spellLogEffectTradeSkillItemParams;
spellLogEffectTradeSkillItemParams.ItemID = entry;
_tradeSkillTargets[effect].push_back(spellLogEffectTradeSkillItemParams);
_tradeSkillTargets[effIndex].push_back(spellLogEffectTradeSkillItemParams);
}
void Spell::ExecuteLogEffectDestroyItem(uint8 effect, uint32 entry)
void Spell::ExecuteLogEffectDestroyItem(uint8 effIndex, uint32 entry)
{
SpellLogEffectFeedPetParams spellLogEffectFeedPetParams;
spellLogEffectFeedPetParams.ItemID = entry;
_feedPetTargets[effect].push_back(spellLogEffectFeedPetParams);
_feedPetTargets[effIndex].push_back(spellLogEffectFeedPetParams);
}
void Spell::ExecuteLogEffectSummonObject(uint8 effect, WorldObject* obj)
void Spell::ExecuteLogEffectSummonObject(uint8 effIndex, WorldObject* obj)
{
SpellLogEffectGenericVictimParams spellLogEffectGenericVictimParams;
spellLogEffectGenericVictimParams.Victim = obj->GetGUID();
_genericVictimTargets[effect].push_back(spellLogEffectGenericVictimParams);
_genericVictimTargets[effIndex].push_back(spellLogEffectGenericVictimParams);
}
void Spell::ExecuteLogEffectUnsummonObject(uint8 effect, WorldObject* obj)
void Spell::ExecuteLogEffectUnsummonObject(uint8 effIndex, WorldObject* obj)
{
SpellLogEffectGenericVictimParams spellLogEffectGenericVictimParams;
spellLogEffectGenericVictimParams.Victim = obj->GetGUID();
_genericVictimTargets[effect].push_back(spellLogEffectGenericVictimParams);
_genericVictimTargets[effIndex].push_back(spellLogEffectGenericVictimParams);
}
void Spell::ExecuteLogEffectResurrect(uint8 effect, Unit* target)

View File

@@ -491,16 +491,16 @@ class Spell
void SendSpellGo();
void SendSpellCooldown();
void SendSpellExecuteLog();
void ExecuteLogEffectTakeTargetPower(int32 effect, Unit* target, uint32 powerType, uint32 points, float amplitude);
void ExecuteLogEffectExtraAttacks(uint8 effect, Unit* victim, uint32 numAttacks);
void ExecuteLogEffectInterruptCast(uint8 effect, Unit* victim, uint32 spellId);
void ExecuteLogEffectDurabilityDamage(uint8 effect, Unit* victim, int32 itemId, int32 amount);
void ExecuteLogEffectOpenLock(uint8 effect, Object* obj);
void ExecuteLogEffectCreateItem(uint8 effect, uint32 entry);
void ExecuteLogEffectDestroyItem(uint8 effect, uint32 entry);
void ExecuteLogEffectSummonObject(uint8 effect, WorldObject* obj);
void ExecuteLogEffectUnsummonObject(uint8 effect, WorldObject* obj);
void ExecuteLogEffectResurrect(uint8 effect, Unit* target);
void ExecuteLogEffectTakeTargetPower(uint8 effIndex, Unit* target, uint32 powerType, uint32 points, float amplitude);
void ExecuteLogEffectExtraAttacks(uint8 effIndex, Unit* victim, uint32 numAttacks);
void ExecuteLogEffectInterruptCast(uint8 effIndex, Unit* victim, uint32 spellId);
void ExecuteLogEffectDurabilityDamage(uint8 effIndex, Unit* victim, int32 itemId, int32 amount);
void ExecuteLogEffectOpenLock(uint8 effIndex, Object* obj);
void ExecuteLogEffectCreateItem(uint8 effIndex, uint32 entry);
void ExecuteLogEffectDestroyItem(uint8 effIndex, uint32 entry);
void ExecuteLogEffectSummonObject(uint8 effIndex, WorldObject* obj);
void ExecuteLogEffectUnsummonObject(uint8 effIndex, WorldObject* obj);
void ExecuteLogEffectResurrect(uint8 effIndex, Unit* target);
void CleanupExecuteLogList();
void SendInterrupted(uint8 result);
void SendChannelUpdate(uint32 time);