Fix TrinityScripts to use the correct config file when -c config_name.conf is used on the trinitycore commandline, thanks to gixxer_j for getting me to finally fix it, and for testing the patch. Be sure to do a full recompile, or you may get errors, this may even require a fresh pull from the repo for some.

--HG--
branch : trunk

1 files changed, 3 insertions, 3 deletions

diff --git a/src/bindings/scripts/ScriptMgr.cpp b/src/bindings/scripts/ScriptMgr.cpp
index 033970c0da5..6b19bba23a9 100644
--- a/src/bindings/scripts/ScriptMgr.cpp
+++ b/src/bindings/scripts/ScriptMgr.cpp
@@ -1332,7 +1332,7 @@ void ScriptsFree()
 }
 
 TRINITY_DLL_EXPORT
-void ScriptsInit()
+void ScriptsInit(char const* cfg_file = "trinitycore.conf")
 {
     bool CanLoadDB = true;
 
@@ -1347,12 +1347,12 @@ void ScriptsInit()
     outstring_log("");
 
     //Get configuration file
-    if (!TScriptConfig.SetSource(_TRINITY_SCRIPT_CONFIG))
+    if (!TScriptConfig.SetSource(cfg_file))
     {
         CanLoadDB = false;
         error_log("TSCR: Unable to open configuration file. Database will be unaccessible. Configuration values will use default.");
     }
-    else outstring_log("TSCR: Using configuration file %s",_TRINITY_SCRIPT_CONFIG);
+    else outstring_log("TSCR: Using configuration file %s",cfg_file);
 
     EAI_ErrorLevel = TScriptConfig.GetIntDefault("EAIErrorLevel", 1);