pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-09-04 14:36:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #635 from xackery/eqemu_config_json

Browse Source 
Eqemu config json
This commit is contained in:
Akkadius
2017-07-17 00:00:13 -05:00
committed by GitHub
parent b9336bad7e 4ed6e20b35
commit 10a27c2081
18 changed files with 246 additions and 424 deletions
Download Patch File Download Diff File Expand all files Collapse all files
world/net.cpp
+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(),
world/world_config.h
+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