diff options
| author | maximius <none@none> | 2009-11-19 19:55:24 -0800 |
|---|---|---|
| committer | maximius <none@none> | 2009-11-19 19:55:24 -0800 |
| commit | f4808f3ff5e8cbe4fc8137bd1ca58eb2b038f76d (patch) | |
| tree | 1c971d300e8601296bcdb22407ae7dadb24e8747 /src/game/SpellEffects.cpp | |
| parent | d7ed79825c1b9cb2ec8a0ca1686ee34d13ae5e2c (diff) | |
*Merge TC1 r1737 and r1754 by BroodWyrn, fixes spells 45151, 45141, 46394 (Brutallus Burn), closes #179
--HG--
branch : trunk
Diffstat (limited to 'src/game/SpellEffects.cpp')
| -rw-r--r-- | src/game/SpellEffects.cpp | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 91ca1d04471..d7cb8baf0fd 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -5216,19 +5216,19 @@ void Spell::EffectScriptEffect(uint32 effIndex) if(m_caster->GetTypeId() != TYPEID_PLAYER) return; - int bag=19; - int slot=0; - Item* item = NULL; + uint8 bag = 19; + uint8 slot = 0; + Item *item = NULL; while (bag < 256) { - item = ((Player*)m_caster)->GetItemByPos(bag,slot); + item = ((Player*)m_caster)->GetItemByPos(bag, slot); if (item && item->GetEntry() == 38587) break; - slot++; + ++slot; if (slot == 39) { slot = 0; - bag++; + ++bag; } } if (bag < 256) @@ -5236,7 +5236,7 @@ void Spell::EffectScriptEffect(uint32 effIndex) if (((Player*)m_caster)->GetItemByPos(bag,slot)->GetCount() == 1) ((Player*)m_caster)->RemoveItem(bag,slot,true); else ((Player*)m_caster)->GetItemByPos(bag,slot)->SetCount(((Player*)m_caster)->GetItemByPos(bag,slot)->GetCount()-1); // Spell 42518 (Braufest - Gratisprobe des Braufest herstellen) - m_caster->CastSpell(m_caster,42518,true); + m_caster->CastSpell(m_caster, 42518, true); return; } break; @@ -5244,12 +5244,23 @@ void Spell::EffectScriptEffect(uint32 effIndex) // Force Cast - Portal Effect: Sunwell Isle case 44876: { - if(!unitTarget) + if (!unitTarget) return; unitTarget->CastSpell(unitTarget, 44870, true); break; } + // Brutallus - Burn + case 45141: + case 45151: + { + //Workaround for Range ... should be global for every ScriptEffect + float radius = GetSpellRadius(sSpellRadiusStore.LookupEntry(m_spellInfo->EffectRadiusIndex[effIndex])); + if (unitTarget && unitTarget->GetTypeId() == TYPEID_PLAYER && unitTarget->GetDistance(m_caster) >= radius && !unitTarget->HasAura(46394) && unitTarget != m_caster) + unitTarget->CastSpell(unitTarget, 46394, true); + + break; + } // spell of Brutallus - Stomp case 45185: { |