diff options
| -rw-r--r-- | src/server/game/Spells/Spell.cpp | 8 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_dk.cpp | 14 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index d38181daab9..5e4effbd237 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -2112,7 +2112,7 @@ void Spell::AddUnitTarget(Unit* target, uint32 effectMask, bool checkIfValid /*= { uint32 validEffectMask = 0; for (SpellEffectInfo const* effect : GetEffects()) - if (effect && (effectMask & effect->EffectIndex) != 0 && CheckEffectTarget(target, effect, losPosition)) + if (effect && (effectMask & (1 << effect->EffectIndex)) != 0 && CheckEffectTarget(target, effect, losPosition)) validEffectMask |= 1 << effect->EffectIndex; effectMask &= validEffectMask; @@ -2223,7 +2223,7 @@ void Spell::AddGOTarget(GameObject* go, uint32 effectMask) { uint32 validEffectMask = 0; for (SpellEffectInfo const* effect : GetEffects()) - if (effect && (effectMask & effect->EffectIndex) != 0 && CheckEffectTarget(go, effect)) + if (effect && (effectMask & (1 << effect->EffectIndex)) != 0 && CheckEffectTarget(go, effect)) validEffectMask |= 1 << effect->EffectIndex; effectMask &= validEffectMask; @@ -2278,7 +2278,7 @@ void Spell::AddItemTarget(Item* item, uint32 effectMask) { uint32 validEffectMask = 0; for (SpellEffectInfo const* effect : GetEffects()) - if (effect && (effectMask & effect->EffectIndex) != 0 && CheckEffectTarget(item, effect)) + if (effect && (effectMask & (1 << effect->EffectIndex)) != 0 && CheckEffectTarget(item, effect)) validEffectMask |= 1 << effect->EffectIndex; effectMask &= validEffectMask; @@ -4531,7 +4531,7 @@ void Spell::TakeCastItem() bool expendable = false; bool withoutCharges = false; - for (int i = 0; i < proto->Effects.size(); ++i) + for (uint8 i = 0; i < proto->Effects.size(); ++i) { // item has limited charges if (proto->Effects[i].Charges) diff --git a/src/server/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp index 5a2e19f08c2..338fb3a00e7 100644 --- a/src/server/scripts/Spells/spell_dk.cpp +++ b/src/server/scripts/Spells/spell_dk.cpp @@ -1231,8 +1231,8 @@ class spell_dk_raise_dead : public SpellScriptLoader private: bool Validate(SpellInfo const* spellInfo) override { - if (!sSpellMgr->GetSpellInfo(spellInfo->GetEffect(EFFECT_1)->CalcValue()) - || !sSpellMgr->GetSpellInfo(spellInfo->GetEffect(EFFECT_2)->CalcValue()) + if (!spellInfo->GetEffect(EFFECT_0) || !sSpellMgr->GetSpellInfo(spellInfo->GetEffect(EFFECT_0)->CalcValue()) + || spellInfo->GetEffect(EFFECT_1) || !sSpellMgr->GetSpellInfo(spellInfo->GetEffect(EFFECT_1)->CalcValue()) || !sSpellMgr->GetSpellInfo(SPELL_DK_RAISE_DEAD_USE_REAGENT) || !sSpellMgr->GetSpellInfo(SPELL_DK_MASTER_OF_GHOULS)) return false; @@ -1312,12 +1312,12 @@ class spell_dk_raise_dead : public SpellScriptLoader uint32 GetGhoulSpellId() { // Do we have talent Master of Ghouls? - if (GetCaster()->HasAura(SPELL_DK_MASTER_OF_GHOULS)) - // summon as pet - return GetSpellInfo()->GetEffect(EFFECT_2)->CalcValue(); + //if (GetCaster()->HasAura(SPELL_DK_MASTER_OF_GHOULS)) + // summon as geist + // return GetSpellInfo()->GetEffect(EFFECT_1)->CalcValue(); - // or guardian - return GetSpellInfo()->GetEffect(EFFECT_1)->CalcValue(); + // or pet + return GetSpellInfo()->GetEffect(EFFECT_0)->CalcValue(); } void HandleRaiseDead(SpellEffIndex /*effIndex*/) |