aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSubv <subv2112@gmail.com>2014-07-09 19:17:25 -0500
committerSubv <subv2112@gmail.com>2014-07-09 19:17:25 -0500
commit9c339d9eeb09e1ca4600728294c77fc3d36f22e3 (patch)
tree0f7b0a1ef3c7b9d4f1d5dff79a088d305a5aa114 /src
parent8b071221df7b1dbf3acaca6d2d64da439a3821b9 (diff)
Core/Quests: Changed QUEST_FLAGS_AUTO_ACCEPT to reflect what it actually does in 4.3.4.
Fixed Quest::IsAutoAccept.
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Quests/QuestDef.cpp2
-rw-r--r--src/server/game/Quests/QuestDef.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Quests/QuestDef.cpp b/src/server/game/Quests/QuestDef.cpp
index 5f811714f3a..14825b9150c 100644
--- a/src/server/game/Quests/QuestDef.cpp
+++ b/src/server/game/Quests/QuestDef.cpp
@@ -321,7 +321,7 @@ uint32 Quest::GetRewMoneyMaxLevel() const
bool Quest::IsAutoAccept() const
{
- return sWorld->getBoolConfig(CONFIG_QUEST_IGNORE_AUTO_ACCEPT) ? false : (Flags & QUEST_FLAGS_AUTO_ACCEPT);
+ return sWorld->getBoolConfig(CONFIG_QUEST_IGNORE_AUTO_ACCEPT) ? false : (SpecialFlags & QUEST_SPECIAL_FLAGS_AUTO_ACCEPT);
}
bool Quest::IsAutoComplete() const
diff --git a/src/server/game/Quests/QuestDef.h b/src/server/game/Quests/QuestDef.h
index 3a9fdf024bf..6418107dab3 100644
--- a/src/server/game/Quests/QuestDef.h
+++ b/src/server/game/Quests/QuestDef.h
@@ -150,7 +150,7 @@ enum QuestFlags
QUEST_FLAGS_AUTOCOMPLETE = 0x00010000, // Quests with this flag player submit automatically by special button in player gui
QUEST_FLAGS_DISPLAY_ITEM_IN_TRACKER = 0x00020000, // Displays usable item in quest tracker
QUEST_FLAGS_OBJ_TEXT = 0x00040000, // use Objective text as Complete text
- QUEST_FLAGS_AUTO_ACCEPT = 0x00080000, // The client recognizes this flag as auto-accept. However, NONE of the current quests (3.3.5a) have this flag. Maybe blizz used to use it, or will use it in the future.
+ QUEST_FLAGS_TAKE_FROM_OBJECTIVE = 0x00080000, // Quests with this flag are offered upon killing their requirement / completing their objective
QUEST_FLAGS_UNK1 = 0x00100000, //
QUEST_FLAGS_AUTO_TAKE = 0x00200000, // Automatically suggestion of accepting quest. Not from npc.
//QUEST_FLAGS_UNK2 = 0x00400000,