branchmerge - urgh!

--HG-- branch : trunk
2010-07-28 19:40:37 +02:00
parent c595eb8ae9 f7a65d6e83
commit 140bc313d2
13 changed files with 69 additions and 23 deletions
@@ -13918,7 +13918,7 @@ void Player::SendPreparedQuest(uint64 guid)
                    return;
                }

-                if (pQuest->HasFlag(QUEST_TRINITY_FLAGS_AUTO_ACCEPT) && CanAddQuest(pQuest, true))
+                if (pQuest->IsAutoAccept() && CanAddQuest(pQuest, true))
                {
                    AddQuest(pQuest, pObject);
                    if (CanCompleteQuest(quest_id))