nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-13 01:08:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #43 from ShinDarth/git

Browse Source 
Fixed Mac OS X build and minor changes to worldconf
This commit is contained in:
Yehonal
2016-08-08 12:26:27 +02:00
committed by GitHub
parent 83c9046ae3 a7a81f90b1
commit ce20864257
5 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bin/db_assembler/db_assembler.sh
View File

@@ -1,6 +1,11 @@
#!/bin/bash
SRCPATH=$(readlink -f "../../")
unamestr=`uname`
if [[ "$unamestr" == 'Darwin' ]]; then
SRCPATH=$(greadlink -f "../../")
else
SRCPATH=$(readlink -f "../../")
fi
source $SRCPATH"/bin/bash_shared/includes.sh"

2
modules/dep/recastnavigation/Detour/DetourNavMesh.h
View File

@@ -30,7 +30,7 @@
#include <linux/types.h>
#endif
#endif
typedef uint64_t uint64;
typedef unsigned long uint64;
#endif
// Note: If you want to use 64-bit refs, change the types of both dtPolyRef & dtTileRef.

4
src/server/authserver/authserver.conf.dist
View File

@@ -244,9 +244,9 @@ WrongPass.BanType = 0
# section my.ini)
# ".;/path/to/unix_socket;username;password;database" - (use Unix sockets on
# Unix/Linux)
# Default: "127.0.0.1;3306;trinity;trinity;auth"
# Default: "127.0.0.1;3306;root;root;auth"
LoginDatabaseInfo = "127.0.0.1;3306;trinity;trinity;auth"
LoginDatabaseInfo = "127.0.0.1;3306;root;root;auth"
#
# LoginDatabase.WorkerThreads

2
src/server/game/World/World.cpp
View File

@@ -444,7 +444,7 @@ void World::LoadConfigSettings(bool reload)
///- Read the player limit and the Message of the day from the config file
if (!reload)
SetPlayerAmountLimit(sConfigMgr->GetIntDefault("PlayerLimit", 100));
SetMotd(sConfigMgr->GetStringDefault("Motd", "Welcome to a Sunwell Core Server."));
SetMotd(sConfigMgr->GetStringDefault("Motd", "Welcome to an AzerothCore server"));
///- Read ticket system setting from the config file
m_bool_configs[CONFIG_ALLOW_TICKETS] = sConfigMgr->GetBoolDefault("AllowTickets", true);

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

@@ -83,13 +83,13 @@ LogsDir = ""
# section my.ini)
# ".;/path/to/unix_socket;username;password;database" - (use Unix sockets on
# Unix/Linux)
# Default: "127.0.0.1;3306;trinity;trinity;auth" - (LoginDatabaseInfo)
# "127.0.0.1;3306;trinity;trinity;world" - (WorldDatabaseInfo)
# "127.0.0.1;3306;trinity;trinity;characters" - (CharacterDatabaseInfo)
# Default: "127.0.0.1;3306;root;root;auth" - (LoginDatabaseInfo)
# "127.0.0.1;3306;root;root;world" - (WorldDatabaseInfo)
# "127.0.0.1;3306;root;root;characters" - (CharacterDatabaseInfo)
LoginDatabaseInfo = "127.0.0.1;3306;trinity;trinity;auth"
WorldDatabaseInfo = "127.0.0.1;3306;trinity;trinity;world"
CharacterDatabaseInfo = "127.0.0.1;3306;trinity;trinity;characters"
LoginDatabaseInfo = "127.0.0.1;3306;root;root;auth"
WorldDatabaseInfo = "127.0.0.1;3306;root;root;world"
CharacterDatabaseInfo = "127.0.0.1;3306;root;root;characters"
#
# LoginDatabase.WorkerThreads