From 57a171951c860447416ed53251faba8f90e60839 Mon Sep 17 00:00:00 2001 From: NoFantasy Date: Fri, 8 Oct 2010 12:14:02 +0200 Subject: [PATCH] [10590] Check if GO is requirement of quest to activate sparkle if it is Signed-off-by: NoFantasy --- src/game/GameObject.cpp | 8 ++++++-- src/shared/revision_nr.h | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/game/GameObject.cpp b/src/game/GameObject.cpp index 393715dca0b..9c3da3564ff 100644 --- a/src/game/GameObject.cpp +++ b/src/game/GameObject.cpp @@ -714,9 +714,13 @@ void GameObject::Respawn() } } -bool GameObject::ActivateToQuest( Player *pTarget)const +bool GameObject::ActivateToQuest(Player *pTarget)const { - if(!sObjectMgr.IsGameObjectForQuests(GetEntry())) + // if GO is ReqCreatureOrGoN for quest + if (pTarget->HasQuestForGO(GetEntry())) + return true; + + if (!sObjectMgr.IsGameObjectForQuests(GetEntry())) return false; switch(GetGoType()) diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index f9f64f5aed2..ec382b595af 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 "10589" + #define REVISION_NR "10590" #endif // __REVISION_NR_H__