From 89833567d2183d8f263ece46cec38a8820dea88d Mon Sep 17 00:00:00 2001 From: runningnak3d Date: Wed, 6 Oct 2010 16:36:50 -0600 Subject: Core/WorldPacket: Add support for generic (type 5) GOs sparkling if objective of quest. Author: NoFantasy --HG-- branch : trunk --- src/server/game/Entities/GameObject/GameObject.cpp | 6 ++++++ src/server/game/Entities/Object/Object.cpp | 4 ++++ src/server/game/Globals/ObjectMgr.cpp | 9 +++++++++ 3 files changed, 19 insertions(+) (limited to 'src') diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index 04fa0b04f27..590d7f73eae 100755 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -872,6 +872,12 @@ bool GameObject::ActivateToQuest(Player *pTarget) const } break; } + case GAMEOBJECT_TYPE_GENERIC: + { + if (pTarget->GetQuestStatus(GetGOInfo()->_generic.questID) == QUEST_STATUS_INCOMPLETE || GetGOInfo()->_generic.questID == -1) + return true; + break; + } case GAMEOBJECT_TYPE_GOOBER: { if (pTarget->GetQuestStatus(GetGOInfo()->goober.questId) == QUEST_STATUS_INCOMPLETE || GetGOInfo()->goober.questId == -1) diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index d3bde92c99a..5e48963c61b 100755 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -686,6 +686,10 @@ void Object::_BuildValuesUpdate(uint8 updatetype, ByteBuffer * data, UpdateMask *data << uint16(9); *data << uint16(-1); break; + case GAMEOBJECT_TYPE_GENERIC: + *data << uint16(8); + *data << uint16(-1); + break; case GAMEOBJECT_TYPE_GOOBER: *data << uint16(9); *data << uint16(-1); diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 395e4842cf3..b030dfa6c20 100755 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -7876,6 +7876,15 @@ void ObjectMgr::LoadGameObjectForQuests() } break; } + case GAMEOBJECT_TYPE_GENERIC: + { + if (goInfo->_generic.questID) //quests objects + { + mGameObjectForQuestSet.insert(go_entry); + count++; + } + break; + } case GAMEOBJECT_TYPE_GOOBER: { if (goInfo->goober.questId) //quests objects -- cgit v1.2.3