From 5184783bd165bec038273fa5cfbc593716856fc2 Mon Sep 17 00:00:00 2001 From: XTZGZoReX Date: Wed, 18 Mar 2009 20:46:39 +0100 Subject: * Fixed/improved the config library: Removed useless methods and fixed the existing. * Few related changes to make the rest of the core reflect the changes. --HG-- branch : trunk --- src/bindings/scripts/ScriptMgr.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/bindings/scripts/ScriptMgr.cpp') diff --git a/src/bindings/scripts/ScriptMgr.cpp b/src/bindings/scripts/ScriptMgr.cpp index fba8143f2f3..0265f2ad690 100644 --- a/src/bindings/scripts/ScriptMgr.cpp +++ b/src/bindings/scripts/ScriptMgr.cpp @@ -625,17 +625,18 @@ extern void AddSC_zulaman(); void LoadDatabase() { //Get db string from file - char const* dbstring = NULL; + std::string dbstring; + TScriptConfig.GetStringDefault("WorldDatabaseInfo", ""); - if (!TScriptConfig.GetString("WorldDatabaseInfo", &dbstring) ) + if (dbstring.empty() ) { error_log("TSCR: Missing world database info from configuration file. Load database aborted."); return; } //Initialize connection to DB - if (dbstring && TScriptDB.Initialize(dbstring) ) - outstring_log("TSCR: TrinityScript database: %s",dbstring); + if (!dbstring.empty() && TScriptDB.Initialize(dbstring.c_str()) ) + outstring_log("TSCR: TrinityScript database: %s",dbstring.c_str()); else { error_log("TSCR: Unable to connect to Database. Load database aborted."); -- cgit v1.2.3