From 6288ca7c687bba7180f4aa6a3ac1de64abbfbe66 Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Tue, 6 Jan 2009 13:55:14 -0600
Subject: *Mangos [7040] Move achievment rewards dat to new DB table. Implement
 sending item rewards by mail. By VladimirMangos.     Support localization
 string fields for new table.     Move achievments related code and data from
 ObjectMgr to new AcievmentGlobalMgr. *Mangos [7041] Add 7-8 rank warlock
 stone. By GriffonHeart.

--HG--
branch : trunk
---
 src/game/World.cpp | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'src/game/World.cpp')

diff --git a/src/game/World.cpp b/src/game/World.cpp
index 3f1fc1773f1..f8bdd9f24c2 100644
--- a/src/game/World.cpp
+++ b/src/game/World.cpp
@@ -37,6 +37,7 @@
 #include "SkillDiscovery.h"
 #include "World.h"
 #include "AccountMgr.h"
+#include "AchievementMgr.h"
 #include "ObjectMgr.h"
 #include "SpellMgr.h"
 #include "Chat.h"
@@ -1106,12 +1107,6 @@ void World::SetInitialWorldSettings()
     sLog.outString( "Loading InstanceTemplate" );
     objmgr.LoadInstanceTemplate();
 
-    sLog.outString( "Loading AchievementCriteriaList..." );
-    objmgr.LoadAchievementCriteriaList();
-
-    sLog.outString( "Loading completed achievements..." );
-    objmgr.LoadCompletedAchievements();
-
     sLog.outString( "Loading SkillLineAbilityMultiMap Data..." );
     spellmgr.LoadSkillLineAbilityMap();
 
@@ -1285,6 +1280,18 @@ void World::SetInitialWorldSettings()
     sLog.outString( "Loading Skill Fishing base level requirements..." );
     objmgr.LoadFishingBaseSkillLevel();
 
+    sLog.outString( "Loading AchievementCriteriaList..." );
+    achievementmgr.LoadAchievementCriteriaList();
+
+    sLog.outString( "Loading achievement rewards..." );
+    achievementmgr.LoadRewards();
+
+    sLog.outString( "Loading achievement reward locale strings..." );
+    achievementmgr.LoadRewardLocales();
+
+    sLog.outString( "Loading completed achievements..." );
+    achievementmgr.LoadCompletedAchievements();
+
     ///- Load dynamic data tables from the database
     sLog.outString( "Loading Auctions..." );
     objmgr.LoadAuctionItems();
-- 
cgit v1.2.3