From d252bbc5860a3872bc2a4bd2f270c3c68d3430ee Mon Sep 17 00:00:00 2001 From: ShinDarth Date: Sat, 6 Aug 2016 18:59:25 +0200 Subject: [PATCH 1/3] Fix DB-assembler on Mac OS X --- bin/db_assembler/db_assembler.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/bin/db_assembler/db_assembler.sh b/bin/db_assembler/db_assembler.sh index 2a29e2f3f..bbc75e738 100755 --- a/bin/db_assembler/db_assembler.sh +++ b/bin/db_assembler/db_assembler.sh @@ -1,6 +1,11 @@ #!/bin/bash -SRCPATH=$(readlink -f "../../") +unamestr=`uname` +if [[ "$unamestr" == 'Darwin' ]]; then + SRCPATH=$(greadlink -f "../../") +else + SRCPATH=$(readlink -f "../../") +fi # # You can pass latest version as first argument of this script From 16baf121f1e6c2081a4bf48be8cfedd73bfc038f Mon Sep 17 00:00:00 2001 From: ShinDarth Date: Sat, 6 Aug 2016 19:15:55 +0200 Subject: [PATCH 2/3] Replace some labels --- src/server/authserver/authserver.conf.dist | 4 ++-- src/server/game/World/World.cpp | 2 +- src/server/worldserver/worldserver.conf.dist | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/server/authserver/authserver.conf.dist b/src/server/authserver/authserver.conf.dist index 57d822a68..d0509d6a2 100644 --- a/src/server/authserver/authserver.conf.dist +++ b/src/server/authserver/authserver.conf.dist @@ -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 diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index 86b087a46..66aeb741e 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -439,7 +439,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); diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist index 31fb37e75..60c376de0 100644 --- a/src/server/worldserver/worldserver.conf.dist +++ b/src/server/worldserver/worldserver.conf.dist @@ -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 From b96f058c175657aa85047f4200196bdd952c9888 Mon Sep 17 00:00:00 2001 From: ShinDarth Date: Sat, 6 Aug 2016 19:26:03 +0200 Subject: [PATCH 3/3] Fix clang build --- modules/dep/recastnavigation/Detour/DetourNavMesh.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/dep/recastnavigation/Detour/DetourNavMesh.h b/modules/dep/recastnavigation/Detour/DetourNavMesh.h index 52d2c505e..fb882929f 100644 --- a/modules/dep/recastnavigation/Detour/DetourNavMesh.h +++ b/modules/dep/recastnavigation/Detour/DetourNavMesh.h @@ -30,7 +30,7 @@ #include #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.