From 426da8ad3d6d985392c51023e9db4f3dfa13a121 Mon Sep 17 00:00:00 2001 From: GriffonHeart Date: Sun, 29 Mar 2009 14:18:50 +0400 Subject: [PATCH] [7579] Check quest state and more generic code use for 58418, 58420. Signed-off-by: VladimirMangos --- src/game/SpellEffects.cpp | 16 +++++++--------- src/shared/revision_nr.h | 2 +- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index d0b13e81e..0b90dc0aa 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -1111,19 +1111,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; } } diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 5ee4f9f83..caf8c9b2f 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "7578" + #define REVISION_NR "7579" #endif // __REVISION_NR_H__