Merge branch 'master' into 330

This commit is contained in:
VladimirMangos 2010-04-08 02:56:04 +04:00
commit 7f7d0624e8
8 changed files with 125 additions and 19 deletions

View file

@ -3425,7 +3425,7 @@ void ObjectMgr::LoadQuests()
if (qinfo->QuestFlags & QUEST_FLAGS_DAILY && qinfo->QuestFlags & QUEST_FLAGS_WEEKLY)
{
sLog.outErrorDb("Weekly Quest %u is marked as daily quest in `QuestFlags`, removed daily flag.",qinfo->GetQuestId());
qinfo->QuestFlags &= QUEST_FLAGS_DAILY;
qinfo->QuestFlags &= ~QUEST_FLAGS_DAILY;
}
if (qinfo->QuestFlags & QUEST_FLAGS_DAILY)