added eqemu_config.json support

This commit is contained in:
Xackery
2017-07-15 20:29:55 -07:00
parent d0ef6a5293
commit 4d12481822
7 changed files with 126 additions and 424 deletions
+1 -1
View File
@@ -166,7 +166,7 @@ int main(int argc, char** argv) {
}
}
Log(Logs::General, Logs::World_Server, "Connecting to MySQL...");
Log(Logs::General, Logs::World_Server, "Connecting to MySQL %s@%s:%i...", Config->DatabaseUsername.c_str(), Config->DatabaseHost.c_str(), Config->DatabasePort);
if (!database.Connect(
Config->DatabaseHost.c_str(),
Config->DatabaseUsername.c_str(),
+1 -1
View File
@@ -52,7 +52,7 @@ public:
_world_config=new WorldConfig;
_config=_world_config;
return _config->ParseFile(EQEmuConfig::ConfigFile.c_str(),"server");
return _config->parseFile();
}
// Accessors for the static private object