aboutsummaryrefslogtreecommitdiff
path: root/src/game/SpellEffects.cpp
diff options
context:
space:
mode:
authormaximius <none@none>2009-09-21 12:31:36 -0700
committermaximius <none@none>2009-09-21 12:31:36 -0700
commit9e5c8db01f792231ecff7e3f60a31ebfea733ff1 (patch)
tree51a91be79cd07dc18955264bcc3d5944f5b21cad /src/game/SpellEffects.cpp
parentf093c18ca105418ff921343c45cc9ac0c77ff455 (diff)
*[8508] Not assign boolean value to integer variable, expecting to always be 0. Also renaming member variables. Author: NoFantasy
*[8516] Implement spell 53271. Author: Shendor *[8519] Use RuneType enum where appropriate and more explicit data for rune init. Author: VladimirMangos Thanks to: Stryker *[8520] Limit telent 49182 and ranks triggering expected:wq runes cooldown case. Author: Shendor *Fix Herald Volazj wrongly targeting himself on Shadow Bolt Volley instead of randomly targeting on Shiver, by tlexii. --HG-- branch : trunk
Diffstat (limited to 'src/game/SpellEffects.cpp')
-rw-r--r--src/game/SpellEffects.cpp21
1 files changed, 20 insertions, 1 deletions
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index e0e84b7c2bb..e01744710e3 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -1619,6 +1619,15 @@ void Spell::EffectDummy(uint32 i)
m_caster->CastCustomSpell(m_caster, 53479, &healthModSpellBasePoints0, NULL, NULL, true, NULL);
return;
}
+ // Master's Call
+ case 53271:
+ {
+ if (!m_caster->isHunterPet() || !unitTarget)
+ return;
+ else
+ m_caster->CastSpell(unitTarget, m_spellInfo->CalculateSimpleValue(i), true);
+ return;
+ }
}
break;
case SPELLFAMILY_PALADIN:
@@ -5588,6 +5597,16 @@ void Spell::EffectScriptEffect(uint32 effIndex)
m_caster->CastCustomSpell(unitTarget, spellId, &basePoint, 0, 0, true);
return;
}
+ // Master's Call
+ case 53271:
+ {
+ if (!unitTarget)
+ return;
+
+ // script effect have in value, but this outdated removed part
+ unitTarget->CastSpell(unitTarget, 62305, true);
+ return;
+ }
default:
break;
}
@@ -6953,7 +6972,7 @@ void Spell::EffectActivateRune(uint32 eff_idx)
for(uint32 j = 0; j < MAX_RUNES; ++j)
{
- if(plr->GetRuneCooldown(j) && plr->GetCurrentRune(j) == m_spellInfo->EffectMiscValue[eff_idx])
+ if(plr->GetRuneCooldown(j) && plr->GetCurrentRune(j) == RuneType(m_spellInfo->EffectMiscValue[eff_idx]))
{
plr->SetRuneCooldown(j, 0);
}