aboutsummaryrefslogtreecommitdiff
path: root/src/bindings/scripts/ScriptMgr.cpp
diff options
context:
space:
mode:
authorXTZGZoReX <none@none>2009-03-18 20:46:39 +0100
committerXTZGZoReX <none@none>2009-03-18 20:46:39 +0100
commit5184783bd165bec038273fa5cfbc593716856fc2 (patch)
treeb9d15444d71ffddeb3f8e5341a05fcec06fca2c2 /src/bindings/scripts/ScriptMgr.cpp
parent5f2e9f1ed190b3108a55efe809463c0b1ed401bd (diff)
* 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
Diffstat (limited to 'src/bindings/scripts/ScriptMgr.cpp')
-rw-r--r--src/bindings/scripts/ScriptMgr.cpp9
1 files changed, 5 insertions, 4 deletions
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.");