Core/Globals: some changes in quest loading

- Made load/reload associated quest tables data-driven, so removed a bunch of similar looking code from ObjectMgr (yay!)
- Codestyle and encapsulation for ExclusiveQuestGroups

2 files changed, 7 insertions, 2 deletions

diff --git a/src/server/game/Quests/QuestDef.cpp b/src/server/game/Quests/QuestDef.cpp
index 6c3b15436e7..69944c3a64c 100644
--- a/src/server/game/Quests/QuestDef.cpp
+++ b/src/server/game/Quests/QuestDef.cpp
@@ -185,13 +185,17 @@ void Quest::LoadQuestTemplateAddon(Field* fields)
     _requiredMinRepValue = fields[13].GetInt32();
     _requiredMaxRepValue = fields[14].GetInt32();
     _startItemCount = fields[15].GetUInt8();
-    _rewardMailSenderEntry = fields[16].GetUInt32();
-    _specialFlags = fields[17].GetUInt8();
+    _specialFlags = fields[16].GetUInt8();
 
     if (_specialFlags & QUEST_SPECIAL_FLAGS_AUTO_ACCEPT)
         _flags |= QUEST_FLAGS_AUTO_ACCEPT;
 }
 
+void Quest::LoadQuestMailSender(Field* fields)
+{
+    _rewardMailSenderEntry = fields[1].GetUInt32();
+}
+
 uint32 Quest::XPValue(Player* player) const
 {
     if (player)
diff --git a/src/server/game/Quests/QuestDef.h b/src/server/game/Quests/QuestDef.h
index b2ff1e4625e..eb2c0aac985 100644
--- a/src/server/game/Quests/QuestDef.h
+++ b/src/server/game/Quests/QuestDef.h
@@ -200,6 +200,7 @@ class TC_GAME_API Quest
         void LoadQuestRequestItems(Field* fields);
         void LoadQuestOfferReward(Field* fields);
         void LoadQuestTemplateAddon(Field* fields);
+        void LoadQuestMailSender(Field* fields);
 
         uint32 XPValue(Player* player) const;