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

Merging

Browse Source
This commit is contained in:
Yehonal
2016-08-07 12:47:10 +02:00
parent 16083b7115 df78f91e0c
commit 47c2b72123
44 changed files with 173 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/shared/Common.h
View File

@@ -16,8 +16,8 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef SUNWELLCORE_COMMON_H
#define SUNWELLCORE_COMMON_H
#ifndef AZEROTHCORE_COMMON_H
#define AZEROTHCORE_COMMON_H
// config.h needs to be included 1st
/// @todo this thingy looks like hack, but its not, need to

4
src/server/shared/Database/DatabaseWorkerPool.h
View File

@@ -57,7 +57,7 @@ class DatabaseWorkerPool
_connections.resize(IDX_SIZE);
WPFatal(mysql_thread_safe(), "Used MySQL library isn't thread-safe.");
WPFatal(mysql_get_client_version() >= MIN_MYSQL_CLIENT_VERSION, "SunwellCore does not support MySQL versions below 5.1");
WPFatal(mysql_get_client_version() >= MIN_MYSQL_CLIENT_VERSION, "AzerothCore does not support MySQL versions below 5.1");
}
~DatabaseWorkerPool()
@@ -79,7 +79,7 @@ class DatabaseWorkerPool
T* t = new T(_queue, _connectionInfo);
res &= t->Open();
if (res) // only check mysql version if connection is valid
WPFatal(mysql_get_server_version(t->GetHandle()) >= MIN_MYSQL_SERVER_VERSION, "SunwellCore does not support MySQL versions below 5.1");
WPFatal(mysql_get_server_version(t->GetHandle()) >= MIN_MYSQL_SERVER_VERSION, "AzerothCore does not support MySQL versions below 5.1");
_connections[IDX_ASYNC][i] = t;
++_connectionCount[IDX_ASYNC];
}

4
src/server/shared/Debugging/Errors.h
View File

@@ -16,8 +16,8 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef SUNWELLCORE_ERRORS_H
#define SUNWELLCORE_ERRORS_H
#ifndef AZEROTHCORE_ERRORS_H
#define AZEROTHCORE_ERRORS_H
#include "Define.h"

4
src/server/shared/Logging/Log.h
View File

@@ -16,8 +16,8 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef SUNWELLCORE_LOG_H
#define SUNWELLCORE_LOG_H
#ifndef AZEROTHCORE_LOG_H
#define AZEROTHCORE_LOG_H
#include "Common.h"
#include <ace/Singleton.h>

4
src/server/shared/Packets/WorldPacket.h
View File

@@ -16,8 +16,8 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef SUNWELLCORE_WORLDPACKET_H
#define SUNWELLCORE_WORLDPACKET_H
#ifndef AZEROTHCORE_WORLDPACKET_H
#define AZEROTHCORE_WORLDPACKET_H
#include "Common.h"
#include "ByteBuffer.h"

2
src/server/shared/SystemConfig.h
View File

@@ -24,7 +24,7 @@
#include "Define.h"
#include "revision.h"
#define _PACKAGENAME "SunwellCore"
#define _PACKAGENAME "AzerothCore"
#if TRINITY_ENDIAN == TRINITY_BIGENDIAN
# define _ENDIAN_STRING "big-endian"