Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-18 16:38:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Spells: core now builds without scripts project, still not stable

Browse Source
This commit is contained in:
Rat
2014-11-24 18:57:49 +01:00
parent 42fa46a11d
commit 2144d6c851
33 changed files with 471 additions and 766 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/server/game/Spells/SpellScript.cpp
View File

@@ -110,11 +110,14 @@ std::string _SpellScript::EffectHook::EffIndexToString()
bool _SpellScript::EffectNameCheck::Check(SpellInfo const* spellEntry, uint8 effIndex)
{
if (!spellEntry->Effects[effIndex].Effect && !effName)
return true;
if (!spellEntry->Effects[effIndex].Effect)
SpellEffectInfo const* effect = spellEntry->GetEffect(effIndex);
if (!effect)
return false;
return (effName == SPELL_EFFECT_ANY) || (spellEntry->Effects[effIndex].Effect == effName);
if (!effect->Effect && !effName)
return true;
if (!effect->Effect)
return false;
return (effName == SPELL_EFFECT_ANY) || (effect->Effect == effName);
}
std::string _SpellScript::EffectNameCheck::ToString()
@@ -132,11 +135,14 @@ std::string _SpellScript::EffectNameCheck::ToString()
bool _SpellScript::EffectAuraNameCheck::Check(SpellInfo const* spellEntry, uint8 effIndex)
{
if (!spellEntry->Effects[effIndex].ApplyAuraName && !effAurName)
return true;
if (!spellEntry->Effects[effIndex].ApplyAuraName)
SpellEffectInfo const* effect = spellEntry->GetEffect(effIndex);
if (!effect)
return false;
return (effAurName == SPELL_AURA_ANY) || (spellEntry->Effects[effIndex].ApplyAuraName == effAurName);
if (!effect->ApplyAuraName && !effAurName)
return true;
if (!effect->ApplyAuraName)
return false;
return (effAurName == SPELL_AURA_ANY) || (effect->ApplyAuraName == effAurName);
}
std::string _SpellScript::EffectAuraNameCheck::ToString()
@@ -218,8 +224,12 @@ bool SpellScript::TargetHook::CheckEffect(SpellInfo const* spellEntry, uint8 eff
if (!targetType)
return false;
if (spellEntry->Effects[effIndex].TargetA.GetTarget() != targetType &&
spellEntry->Effects[effIndex].TargetB.GetTarget() != targetType)
SpellEffectInfo const* effect = spellEntry->GetEffect(effIndex);
if (!effect)
return false;
if (effect->TargetA.GetTarget() != targetType &&
effect->TargetB.GetTarget() != targetType)
return false;
SpellImplicitTargetInfo targetInfo(targetType);