nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-21 20:56:23 +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/worldserver/CMakeLists.txt
View File

@@ -208,3 +208,5 @@ endif()
if( USE_COREPCH )
add_cxx_pch(worldserver ${worldserver_PCH_HDR} ${worldserver_PCH_SRC})
endif()
RUN_HOOK("AFTER_WORLDSERVER_CMAKE")

11
src/server/worldserver/Main.cpp
View File

@@ -125,12 +125,21 @@ extern int main(int argc, char** argv)
++c;
}
if (!sConfigMgr->LoadInitial(cfg_file))
std::string cfg_def_file=_TRINITY_CORE_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(cfg_file))
{
printf("Invalid or missing configuration file : %s\n", cfg_file);
printf("Verify that the file exists and has \'[worldserver]' written in the top of the file!\n");
return 1;
}
sLog->outString("Using configuration file %s.", cfg_file);
sLog->outString("Using SSL version: %s (library: %s)", OPENSSL_VERSION_TEXT, SSLeay_version(SSLEAY_VERSION));

17
src/server/worldserver/worldserver.conf.dist
View File

@@ -1407,6 +1407,15 @@ Command.LookupMaxResults = 0
AllowTickets = 1
# DeletedCharacterTicketTrace
# Description: Keep trace of tickets opened by deleted characters
# gm_ticket.playerGuid will be 0, old GUID and character name
# will be included in gm_ticket.comment
# Default: 0 - (Disabled)
# 1 - (Enabled)
DeletedCharacterTicketTrace = 0
#
# DungeonFinder.OptionsMask
# Description: Dungeon and raid finder system.
@@ -2439,6 +2448,14 @@ AutoBroadcast.Timer = 60000
Battleground.CastDeserter = 1
#
# Battleground.RandomCrossFaction.Enable
# Description: Enable random battleground crossfaction randomizing system
# Default: 0 - (Disabled)
# 1 - (Enabled)
Battleground.RandomCrossFaction.Enable = 1
#
# Battleground.QueueAnnouncer.Enable
# Description: Announce battleground queue status to chat.