From 76413e28fec81443e3e57a9376c3450e5a218582 Mon Sep 17 00:00:00 2001 From: Chaz Brown Date: Fri, 24 Apr 2009 00:48:44 -0400 Subject: Modify TrinityScript to use main config file. (Fix problems when using -c on the command line) --HG-- branch : trunk --- src/bindings/scripts/ScriptMgr.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/bindings/scripts/ScriptMgr.cpp') diff --git a/src/bindings/scripts/ScriptMgr.cpp b/src/bindings/scripts/ScriptMgr.cpp index 3d8ca4979d7..465c92d7f88 100644 --- a/src/bindings/scripts/ScriptMgr.cpp +++ b/src/bindings/scripts/ScriptMgr.cpp @@ -1347,12 +1347,12 @@ void ScriptsInit() outstring_log(""); //Get configuration file - if (!TScriptConfig.SetSource(_TRINITY_SCRIPT_CONFIG)) + if (!TScriptConfig.SetSource(sConfig.GetFilename())) { 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",TScriptConfig.GetFilename()); EAI_ErrorLevel = TScriptConfig.GetIntDefault("EAIErrorLevel", 1); -- cgit v1.2.3