Merge MaNGOS, Gossip System. Autor NoFantasy.

* DB support required
* Closes #859

--HG--
branch : trunk

1 files changed, 16 insertions, 9 deletions

diff --git a/src/game/Level3.cpp b/src/game/Level3.cpp
index dada1862338..ae4aecae0d8 100644
--- a/src/game/Level3.cpp
+++ b/src/game/Level3.cpp
@@ -597,7 +597,6 @@ bool ChatHandler::HandleReloadAllLootCommand(const char*)
 bool ChatHandler::HandleReloadAllNpcCommand(const char* /*args*/)
 {
     HandleReloadNpcGossipCommand("a");
-    HandleReloadNpcOptionCommand("a");
     HandleReloadNpcTrainerCommand("a");
     HandleReloadNpcVendorCommand("a");
     HandleReloadPointsOfInterestCommand("a");
@@ -773,6 +772,22 @@ bool ChatHandler::HandleReloadCreatureQuestInvRelationsCommand(const char*)
     return true;
 }
 
+bool ChatHandler::HandleReloadGossipMenuCommand(const char*)
+{
+    sLog.outString( "Re-Loading `gossip_menu` Table!" );
+    objmgr.LoadGossipMenu();
+    SendGlobalSysMessage("DB table `gossip_menu` reloaded.");
+    return true;
+}
+
+bool ChatHandler::HandleReloadGossipMenuOptionCommand(const char*)
+{
+    sLog.outString( "Re-Loading `gossip_menu_option` Table!" );
+    objmgr.LoadGossipMenuItems();
+    SendGlobalSysMessage("DB table `gossip_menu_option` reloaded.");
+    return true;
+}
+
 bool ChatHandler::HandleReloadGOQuestRelationsCommand(const char*)
 {
     sLog.outString( "Loading Quests Relations... (`gameobject_questrelation`)" );
@@ -925,14 +940,6 @@ bool ChatHandler::HandleReloadTrinityStringCommand(const char*)
     return true;
 }
 
-bool ChatHandler::HandleReloadNpcOptionCommand(const char*)
-{
-    sLog.outString( "Re-Loading `npc_option` Table!" );
-    objmgr.LoadNpcOptions();
-    SendGlobalGMSysMessage("DB table `npc_option` reloaded.");
-    return true;
-}
-
 bool ChatHandler::HandleReloadNpcGossipCommand(const char*)
 {
     sLog.outString( "Re-Loading `npc_gossip` Table!" );