Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 09:17:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

*[8508] Not assign boolean value to integer variable, expecting to always be 0. Also renaming member variables. Author: NoFantasy

Browse Source 
*[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
This commit is contained in:
maximius
2009-09-21 12:31:36 -07:00
parent f093c18ca1
commit 9e5c8db01f
9 changed files with 75 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/game/SpellEffects.cpp
View File

@@ -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);
}