From 31c6b10a192671562f38f17f9e6270979ebe417c Mon Sep 17 00:00:00 2001 From: Brian Date: Sun, 20 Dec 2009 09:03:45 -0700 Subject: * Add support for the use of Gameobject type 10 (GOOBER) use when not on quest * if data1=-1 --HG-- branch : trunk --- src/game/GameObject.cpp | 2 +- src/game/GameObject.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/game/GameObject.cpp b/src/game/GameObject.cpp index 02a3ede06aa..a659fdb3209 100644 --- a/src/game/GameObject.cpp +++ b/src/game/GameObject.cpp @@ -824,7 +824,7 @@ bool GameObject::ActivateToQuest(Player *pTarget) const } case GAMEOBJECT_TYPE_GOOBER: { - if (pTarget->GetQuestStatus(GetGOInfo()->goober.questId) == QUEST_STATUS_INCOMPLETE) + if (pTarget->GetQuestStatus(GetGOInfo()->goober.questId) == QUEST_STATUS_INCOMPLETE || GetGOInfo()->goober.questId == -1) return true; break; } diff --git a/src/game/GameObject.h b/src/game/GameObject.h index 7d55afb7e60..bc168a3eda4 100644 --- a/src/game/GameObject.h +++ b/src/game/GameObject.h @@ -170,7 +170,7 @@ struct GameObjectInfo struct { uint32 lockId; //0 -> Lock.dbc - uint32 questId; //1 + int32 questId; //1 uint32 eventId; //2 uint32 autoCloseTime; //3 uint32 customAnim; //4 -- cgit v1.2.3