*Merge to solve EOL issue.

--HG--
branch : trunk

1 files changed, 22 insertions, 1 deletions

diff --git a/src/game/Level3.cpp b/src/game/Level3.cpp
index 51b9a092ba3..a5c6f54016c 100644
--- a/src/game/Level3.cpp
+++ b/src/game/Level3.cpp
@@ -136,7 +136,8 @@ bool ChatHandler::HandleReloadAllScriptsCommand(const char*)
     HandleReloadSpellScriptsCommand("a");
     SendGlobalSysMessage("DB tables `*_scripts` reloaded.");
     HandleReloadDbScriptStringCommand("a");
-    return true;
+    HandleReloadWpScriptsCommand("a");
+	return true;
 }
 
 bool ChatHandler::HandleReloadAllSpellCommand(const char*)
@@ -542,6 +543,26 @@ bool ChatHandler::HandleReloadEventScriptsCommand(const char* arg)
     return true;
 }
 
+bool ChatHandler::HandleReloadWpScriptsCommand(const char* arg)
+{
+    if(sWorld.IsScriptScheduled())
+    {
+        SendSysMessage("DB scripts used currently, please attempt reload later.");
+        SetSentErrorMessage(true);
+        return false;
+    }
+
+    if(*arg!='a')
+        sLog.outString( "Re-Loading Scripts from `event_scripts`...");
+
+	objmgr.LoadWaypointScripts();
+ 
+	if(*arg!='a')
+        SendGlobalSysMessage("DB table `event_scripts` reloaded.");
+
+    return true;
+}
+
 bool ChatHandler::HandleReloadQuestEndScriptsCommand(const char* arg)
 {
     if(sWorld.IsScriptScheduled())