diff options
author | funjoker <torti-esser@web.de> | 2017-03-20 08:54:29 +0100 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2017-03-20 08:54:29 +0100 |
commit | 945cfce1f63f2d629d32da8be2e696900e81d835 (patch) | |
tree | 5689e690facc26cfb0af9301a6ce683f2e9b6129 /src/server/game/Globals/ObjectMgr.cpp | |
parent | d4176eb2f1a1860ee0691111d62cb8b231ac2fff (diff) |
Core/Conditions: Implemented new condition type CONDITION_QUEST_OBJECTIVE_COMPLETE (#18235)
Closes #17863
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.cpp')
-rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index b063d786aa5..5dde20e57f7 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -4310,7 +4310,7 @@ void ObjectMgr::LoadQuests() for (QuestObjective const& obj : qinfo->GetObjectives()) { // Store objective for lookup by id - _questObjectives[obj.ID] = std::make_pair(&obj, qinfo->GetQuestId()); + _questObjectives[obj.ID] = &obj; // Check storage index for objectives which store data if (obj.StorageIndex < 0) @@ -5863,9 +5863,9 @@ void ObjectMgr::LoadQuestAreaTriggers() for (auto const& pair : _questObjectives) { - QuestObjective const* objective = pair.second.first; + QuestObjective const* objective = pair.second; if (objective->Type == QUEST_OBJECTIVE_AREATRIGGER) - _questAreaTriggerStore[objective->ObjectID].insert(pair.second.second); + _questAreaTriggerStore[objective->ObjectID].insert(objective->QuestID); } TC_LOG_INFO("server.loading", ">> Loaded %u quest trigger points in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); |