nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-02-14 07:53:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into git

Browse Source
This commit is contained in:
ShinDarth
2016-08-07 14:55:21 +02:00
parent b96f058c17 1fcfb9af5a
commit a7a81f90b1
84 changed files with 1531 additions and 680 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/authserver/CMakeLists.txt
View File

@@ -108,3 +108,5 @@ endif()
if (USE_COREPCH)
add_cxx_pch(authserver ${authserver_PCH_HDR} ${authserver_PCH_SRC})
endif()
RUN_HOOK("AFTER_AUTHSERVER_CMAKE")

10
src/server/authserver/Main.cpp
View File

@@ -104,7 +104,15 @@ extern int main(int argc, char** argv)
++count;
}
if (!sConfigMgr->LoadInitial(configFile))
std::string cfg_def_file=_TRINITY_REALM_CONFIG;
cfg_def_file += ".dist";
if (!sConfigMgr->LoadInitial(cfg_def_file.c_str())) {
printf("Invalid or missing default configuration file : %s\n", cfg_def_file.c_str());
return 1;
}
if (!sConfigMgr->LoadMore(configFile))
{
printf("Invalid or missing configuration file : %s\n", configFile);
printf("Verify that the file exists and has \'[authserver]\' written in the top of the file!\n");