diff --git a/src/game/SharedDefines.h b/src/game/SharedDefines.h index e390eed72..5ee0f979c 100644 --- a/src/game/SharedDefines.h +++ b/src/game/SharedDefines.h @@ -623,7 +623,7 @@ enum SpellEffects SPELL_EFFECT_WMO_DAMAGE = 87, SPELL_EFFECT_WMO_REPAIR = 88, SPELL_EFFECT_WMO_CHANGE = 89, - SPELL_EFFECT_KILL_CREDIT = 90, + SPELL_EFFECT_KILL_CREDIT_PERSONAL = 90, SPELL_EFFECT_THREAT_ALL = 91, SPELL_EFFECT_ENCHANT_HELD_ITEM = 92, SPELL_EFFECT_BREAK_PLAYER_TARGETING = 93, @@ -667,7 +667,7 @@ enum SpellEffects SPELL_EFFECT_131 = 131, SPELL_EFFECT_PLAY_MUSIC = 132, SPELL_EFFECT_UNLEARN_SPECIALIZATION = 133, - SPELL_EFFECT_KILL_CREDIT2 = 134, + SPELL_EFFECT_KILL_CREDIT_GROUP = 134, SPELL_EFFECT_CALL_PET = 135, SPELL_EFFECT_HEAL_PCT = 136, SPELL_EFFECT_ENERGIZE_PCT = 137, @@ -682,11 +682,11 @@ enum SpellEffects SPELL_EFFECT_ACTIVATE_RUNE = 146, SPELL_EFFECT_QUEST_FAIL = 147, SPELL_EFFECT_148 = 148, - SPELL_EFFECT_149 = 149, + SPELL_EFFECT_CHARGE2 = 149, SPELL_EFFECT_150 = 150, SPELL_EFFECT_TRIGGER_SPELL_2 = 151, SPELL_EFFECT_152 = 152, - SPELL_EFFECT_153 = 153, + SPELL_EFFECT_CREATE_PET = 153, SPELL_EFFECT_TEACH_TAXI_NODE = 154, SPELL_EFFECT_TITAN_GRIP = 155, SPELL_EFFECT_ENCHANT_ITEM_PRISMATIC = 156, diff --git a/src/game/Spell.h b/src/game/Spell.h index cd2e8111e..1f2f3e901 100644 --- a/src/game/Spell.h +++ b/src/game/Spell.h @@ -336,7 +336,7 @@ class Spell void EffectTriggerSpellWithValue(SpellEffectIndex eff_idx); void EffectTriggerRitualOfSummoning(SpellEffectIndex eff_idx); void EffectKillCreditPersonal(SpellEffectIndex eff_idx); - void EffectKillCredit(SpellEffectIndex eff_idx); + void EffectKillCreditGroup(SpellEffectIndex eff_idx); void EffectQuestFail(SpellEffectIndex eff_idx); void EffectActivateRune(SpellEffectIndex eff_idx); diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 6bf4a557f..b71a0c680 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -150,7 +150,7 @@ pEffect SpellEffects[TOTAL_SPELL_EFFECTS]= &Spell::EffectNULL, // 87 SPELL_EFFECT_WMO_DAMAGE (57 spells in 3.3.2) &Spell::EffectNULL, // 88 SPELL_EFFECT_WMO_REPAIR (2 spells in 3.3.2) &Spell::EffectNULL, // 89 SPELL_EFFECT_WMO_CHANGE (7 spells in 3.3.2) - &Spell::EffectKillCreditPersonal, // 90 SPELL_EFFECT_KILL_CREDIT Kill credit but only for single person + &Spell::EffectKillCreditPersonal, // 90 SPELL_EFFECT_KILL_CREDIT_PERSONAL Kill credit but only for single person &Spell::EffectUnused, // 91 SPELL_EFFECT_THREAT_ALL one spell: zzOLDBrainwash &Spell::EffectEnchantHeldItem, // 92 SPELL_EFFECT_ENCHANT_HELD_ITEM &Spell::EffectBreakPlayerTargeting, // 93 SPELL_EFFECT_BREAK_PLAYER_TARGETING @@ -194,7 +194,7 @@ pEffect SpellEffects[TOTAL_SPELL_EFFECTS]= &Spell::EffectUnused, //131 SPELL_EFFECT_131 used in some test spells &Spell::EffectPlayMusic, //132 SPELL_EFFECT_PLAY_MUSIC sound id in misc value (SoundEntries.dbc) &Spell::EffectUnlearnSpecialization, //133 SPELL_EFFECT_UNLEARN_SPECIALIZATION unlearn profession specialization - &Spell::EffectKillCredit, //134 SPELL_EFFECT_KILL_CREDIT misc value is creature entry + &Spell::EffectKillCreditGroup, //134 SPELL_EFFECT_KILL_CREDIT_GROUP misc value is creature entry &Spell::EffectNULL, //135 SPELL_EFFECT_CALL_PET &Spell::EffectHealPct, //136 SPELL_EFFECT_HEAL_PCT &Spell::EffectEnergisePct, //137 SPELL_EFFECT_ENERGIZE_PCT @@ -8071,7 +8071,7 @@ void Spell::EffectKillCreditPersonal(SpellEffectIndex eff_idx) ((Player*)unitTarget)->KilledMonsterCredit(m_spellInfo->EffectMiscValue[eff_idx]); } -void Spell::EffectKillCredit(SpellEffectIndex eff_idx) +void Spell::EffectKillCreditGroup(SpellEffectIndex eff_idx) { if(!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER) return; diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 0f9e99d2f..6464258ca 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "10739" + #define REVISION_NR "10740" #endif // __REVISION_NR_H__