diff options
author | Chaz Brown <iamparadox@netscape.net> | 2009-04-24 00:48:35 -0400 |
---|---|---|
committer | Chaz Brown <iamparadox@netscape.net> | 2009-04-24 00:48:35 -0400 |
commit | 034a9be7236ae881bddb7d6e474c7a22653e50f1 (patch) | |
tree | ab097916d29c2c012909bb50f098e17b4ade1950 /src/bindings/scripts/ScriptMgr.cpp | |
parent | d4c15bb11a5c42cfdd3faee6922c5a0560bdbc83 (diff) |
Modify TrinityScript to use main config file. (Fix problems when using -c on the command line)
--HG--
branch : trunk
Diffstat (limited to 'src/bindings/scripts/ScriptMgr.cpp')
-rw-r--r-- | src/bindings/scripts/ScriptMgr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bindings/scripts/ScriptMgr.cpp b/src/bindings/scripts/ScriptMgr.cpp index 10b23ba1b47..e223fd83bac 100644 --- a/src/bindings/scripts/ScriptMgr.cpp +++ b/src/bindings/scripts/ScriptMgr.cpp @@ -948,12 +948,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()); outstring_log(""); |