diff options
| author | megamage <none@none> | 2009-03-29 17:16:30 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-03-29 17:16:30 -0600 |
| commit | 28532e25249b1ed23b4e93f8a66f56cc3ed390c2 (patch) | |
| tree | 630048549548aa72a07b13be237a6affe03e723c | |
| parent | e3da95f16a63cd014ded2ddbd588e1bda106936c (diff) | |
[7579] Check quest state and more generic code use for 58418, 58420.Author: GriffonHeart
--HG--
branch : trunk
| -rw-r--r-- | src/game/SpellEffects.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 7e24bc4f81d..46bbd8fbb0b 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -1241,19 +1241,17 @@ void Spell::EffectDummy(uint32 i) return; } case 58418: // Portal to Orgrimmar - { - if(!unitTarget) - return; - - unitTarget->CastSpell(unitTarget, 58419, true); - return; - } case 58420: // Portal to Stormwind { - if(!unitTarget) + if(!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER) return; - unitTarget->CastSpell(unitTarget, 58421, true); + uint32 spellID = m_spellInfo->EffectBasePoints[0] + 1; + uint32 questID = m_spellInfo->EffectBasePoints[1] + 1; + + if( ((Player*)unitTarget)->GetQuestStatus(questID) == QUEST_STATUS_COMPLETE && !((Player*)unitTarget)->GetQuestRewardStatus (questID) ) + unitTarget->CastSpell(unitTarget, spellID, true); + return; } } |