Core/Quests: Some cleanup in quest relation accessing

--HG--
branch : trunk

1 files changed, 14 insertions, 14 deletions

diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp
index 365e4195524..ae71dce5ee0 100644
--- a/src/server/game/Events/GameEventMgr.cpp
+++ b/src/server/game/Events/GameEventMgr.cpp
@@ -1534,23 +1534,23 @@ void GameEventMgr::UpdateEventQuests(uint16 event_id, bool activate)
     QuestRelList::iterator itr;
     for (itr = mGameEventCreatureQuests[event_id].begin(); itr != mGameEventCreatureQuests[event_id].end(); ++itr)
     {
-        QuestRelations &CreatureQuestMap = sObjectMgr.mCreatureQuestRelations;
-        if (activate)                                       // Add the pair(id,quest) to the multimap
-            CreatureQuestMap.insert(QuestRelations::value_type(itr->first, itr->second));
+        QuestRelations* CreatureQuestMap = sObjectMgr.GetCreatureQuestRelationMap();
+        if (activate)                                           // Add the pair(id,quest) to the multimap
+            CreatureQuestMap->insert(QuestRelations::value_type(itr->first, itr->second));
         else
         {
             if (!hasCreatureQuestActiveEventExcept(itr->second,event_id))
             {
                 // Remove the pair(id,quest) from the multimap
-                QuestRelations::iterator qitr = CreatureQuestMap.find(itr->first);
-                if (qitr == CreatureQuestMap.end())
+                QuestRelations::iterator qitr = CreatureQuestMap->find(itr->first);
+                if (qitr == CreatureQuestMap->end())
                     continue;
-                QuestRelations::iterator lastElement = CreatureQuestMap.upper_bound(itr->first);
+                QuestRelations::iterator lastElement = CreatureQuestMap->upper_bound(itr->first);
                 for (; qitr != lastElement; ++qitr)
                 {
                     if (qitr->second == itr->second)
                     {
-                        CreatureQuestMap.erase(qitr);           // iterator is now no more valid
+                        CreatureQuestMap->erase(qitr);          // iterator is now no more valid
                         break;                                  // but we can exit loop since the element is found
                     }
                 }
@@ -1559,23 +1559,23 @@ void GameEventMgr::UpdateEventQuests(uint16 event_id, bool activate)
     }
     for (itr = mGameEventGameObjectQuests[event_id].begin(); itr != mGameEventGameObjectQuests[event_id].end(); ++itr)
     {
-        QuestRelations &GameObjectQuestMap = sObjectMgr.mGOQuestRelations;
-        if (activate)                                       // Add the pair(id,quest) to the multimap
-            GameObjectQuestMap.insert(QuestRelations::value_type(itr->first, itr->second));
+        QuestRelations* GameObjectQuestMap = sObjectMgr.GetGOQuestRelationMap();
+        if (activate)                                           // Add the pair(id,quest) to the multimap
+            GameObjectQuestMap->insert(QuestRelations::value_type(itr->first, itr->second));
         else
         {
             if (!hasGameObjectQuestActiveEventExcept(itr->second,event_id))
             {
                 // Remove the pair(id,quest) from the multimap
-                QuestRelations::iterator qitr = GameObjectQuestMap.find(itr->first);
-                if (qitr == GameObjectQuestMap.end())
+                QuestRelations::iterator qitr = GameObjectQuestMap->find(itr->first);
+                if (qitr == GameObjectQuestMap->end())
                     continue;
-                QuestRelations::iterator lastElement = GameObjectQuestMap.upper_bound(itr->first);
+                QuestRelations::iterator lastElement = GameObjectQuestMap->upper_bound(itr->first);
                 for (; qitr != lastElement; ++qitr)
                 {
                     if (qitr->second == itr->second)
                     {
-                        GameObjectQuestMap.erase(qitr);           // iterator is now no more valid
+                        GameObjectQuestMap->erase(qitr);        // iterator is now no more valid
                         break;                                  // but we can exit loop since the element is found
                     }
                 }