aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBrian <runningnak3d@gmail.com>2009-12-20 09:03:45 -0700
committerBrian <runningnak3d@gmail.com>2009-12-20 09:03:45 -0700
commit31c6b10a192671562f38f17f9e6270979ebe417c (patch)
treed634d126121438569fb75edd35e7e4ff21450a9f /src
parent857fa2e4f6fb9c5e5821da2af6baccf22797261b (diff)
* Add support for the use of Gameobject type 10 (GOOBER) use when not on quest
* if data1=-1 --HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/game/GameObject.cpp2
-rw-r--r--src/game/GameObject.h2
2 files changed, 2 insertions, 2 deletions
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