mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-19 00:48:56 +01:00
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
This commit is contained in:
@@ -933,7 +933,7 @@ void ScriptsFree()
|
||||
}
|
||||
|
||||
TRINITY_DLL_EXPORT
|
||||
void ScriptsInit()
|
||||
void ScriptsInit(char const* cfg_file = "trinitycore.conf")
|
||||
{
|
||||
bool CanLoadDB = true;
|
||||
|
||||
@@ -948,12 +948,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);
|
||||
|
||||
outstring_log("");
|
||||
|
||||
|
||||
Reference in New Issue
Block a user