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

2 files changed, 4 insertions, 2 deletions

diff --git a/src/game/ScriptCalls.cpp b/src/game/ScriptCalls.cpp
index bce96344931..5f3b8a96b0d 100644
--- a/src/game/ScriptCalls.cpp
+++ b/src/game/ScriptCalls.cpp
@@ -22,9 +22,11 @@
 #include <dlfcn.h>
 #endif
 
+#include "Common.h"
 #include "Platform/Define.h"
 #include "ScriptCalls.h"
 #include "World.h"
+#include "Config/ConfigEnv.h"
 
 ScriptsSet Script=NULL;
 
@@ -95,7 +97,7 @@ bool LoadScriptingModule(char const* libName)
     UnloadScriptingModule();
 
     Script=testScript;
-    Script->ScriptsInit();
+    Script->ScriptsInit(sConfig.GetFilename().c_str());
 
     sWorld.SetScriptsVersion(Script->ScriptsVersion());
 
diff --git a/src/game/ScriptCalls.h b/src/game/ScriptCalls.h
index 83a6572e0e1..68f6c5dac01 100644
--- a/src/game/ScriptCalls.h
+++ b/src/game/ScriptCalls.h
@@ -37,7 +37,7 @@ class InstanceData;
 bool LoadScriptingModule(char const* libName = "");
 void UnloadScriptingModule();
 
-typedef void(TRINITY_IMPORT * scriptCallScriptsInit) ();
+typedef void(TRINITY_IMPORT * scriptCallScriptsInit) (char const*);
 typedef void(TRINITY_IMPORT * scriptCallScriptsFree) ();
 typedef char const* (TRINITY_IMPORT * scriptCallScriptsVersion) ();