aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Globals/ObjectMgr.cpp
diff options
context:
space:
mode:
authorSpp <spp@jorge.gr>2013-02-27 04:08:19 +0100
committerSpp <spp@jorge.gr>2013-02-27 04:08:19 +0100
commit03505a3a42c8bc1263a70951b6c456055fb5b690 (patch)
tree99449180552fae7dc25a19e86cd372d98236c41c /src/server/game/Globals/ObjectMgr.cpp
parentcd24526aaca0c52caee21063bd4f477590654785 (diff)
parent480c6cf4dd8965627aa7bc6e903558f2fa5c3ea6 (diff)
Merge branch 'master' into 4.3.4
Conflicts: src/server/game/Entities/Player/Player.h src/server/game/Quests/QuestDef.cpp src/server/game/Quests/QuestDef.h src/server/game/World/World.cpp src/server/game/World/World.h src/server/scripts/Commands/cs_reload.cpp
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.cpp')
-rw-r--r--src/server/game/Globals/ObjectMgr.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index 46fec55b820..a29227462ea 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -3643,14 +3643,14 @@ void ObjectMgr::LoadQuests()
}
}
- if (qinfo->Flags & QUEST_FLAGS_AUTO_REWARDED)
+ if (qinfo->Flags & QUEST_FLAGS_TRACKING)
{
// at auto-reward can be rewarded only RewardChoiceItemId[0]
for (int j = 1; j < QUEST_REWARD_CHOICES_COUNT; ++j )
{
if (uint32 id = qinfo->RewardChoiceItemId[j])
{
- sLog->outError(LOG_FILTER_SQL, "Quest %u has `RewardChoiceItemId%d` = %u but item from `RewardChoiceItemId%d` can't be rewarded with quest flag QUEST_FLAGS_AUTO_REWARDED.",
+ sLog->outError(LOG_FILTER_SQL, "Quest %u has `RewardChoiceItemId%d` = %u but item from `RewardChoiceItemId%d` can't be rewarded with quest flag QUEST_FLAGS_TRACKING.",
qinfo->GetQuestId(), j+1, id, j+1);
// no changes, quest ignore this data
}