Merge pull request #635 from xackery/eqemu_config_json

Eqemu config json
This commit is contained in:
Akkadius
2017-07-17 00:00:13 -05:00
committed by GitHub
18 changed files with 246 additions and 424 deletions
+1 -1
View File
@@ -49,7 +49,7 @@ class ZoneConfig : public EQEmuConfig {
_zone_config=new ZoneConfig;
_config=_zone_config;
return _config->ParseFile(EQEmuConfig::ConfigFile.c_str(),"server");
return _config->parseFile();
}
// Accessors for the static private object