Merge MaNGOS, Gossip System. Autor NoFantasy.

* DB support required
* Closes #859

--HG--
branch : trunk

1 files changed, 8 insertions, 2 deletions

diff --git a/src/game/World.cpp b/src/game/World.cpp
index 05d7e5cef21..563da29ab2d 100644
--- a/src/game/World.cpp
+++ b/src/game/World.cpp
@@ -1547,8 +1547,14 @@ void World::SetInitialWorldSettings()
     sLog.outString("Loading Npc Text Id...");
     objmgr.LoadNpcTextId();                                 // must be after load Creature and NpcText
 
-    sLog.outString("Loading Npc Options...");
-    objmgr.LoadNpcOptions();
+    sLog.outString( "Loading Gossip scripts...");
+    objmgr.LoadGossipScripts();                             // must be before gossip menu options
+
+    sLog.outString("Loading Gossip menu...");
+    objmgr.LoadGossipMenu();
+
+    sLog.outString("Loading Gossip menu options...");
+    objmgr.LoadGossipMenuItems();
 
     sLog.outString("Loading Vendors...");
     objmgr.LoadVendors();                                   // must be after load CreatureTemplate and ItemTemplate