Modify TrinityScript to use main config file. (Fix problems when using -c on the command line)

--HG--
branch : trunk
This commit is contained in:
Chaz Brown
2009-04-24 00:48:44 -04:00
parent e97ddc5872
commit 76413e28fe
+2 -2
View File
@@ -1347,12 +1347,12 @@ void ScriptsInit()
outstring_log(""); outstring_log("");
//Get configuration file //Get configuration file
if (!TScriptConfig.SetSource(_TRINITY_SCRIPT_CONFIG)) if (!TScriptConfig.SetSource(sConfig.GetFilename()))
{ {
CanLoadDB = false; CanLoadDB = false;
error_log("TSCR: Unable to open configuration file. Database will be unaccessible. Configuration values will use default."); 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); EAI_ErrorLevel = TScriptConfig.GetIntDefault("EAIErrorLevel", 1);