Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/game/AI/EventAI/CreatureEventAI.cpp src/server/game/AI/EventAI/CreatureEventAIMgr.h src/server/game/Entities/Creature/Creature.cpp src/server/game/Entities/Object/Object.cpp src/server/game/Entities/Player/Player.cpp src/server/game/Entities/Unit/Unit.cpp src/server/game/Entities/Unit/Unit.h src/server/game/Guilds/Guild.cpp src/server/game/Handlers/MailHandler.cpp src/server/game/Spells/Auras/SpellAuraEffects.cpp src/server/game/Spells/Auras/SpellAuras.cpp src/server/game/Spells/SpellEffects.cpp src/server/scripts/Commands/cs_misc.cpp src/server/scripts/Commands/cs_modify.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp src/server/scripts/Kalimdor/zone_azshara.cpp src/server/scripts/Kalimdor/zone_darkshore.cpp src/server/scripts/Kalimdor/zone_durotar.cpp src/server/scripts/Kalimdor/zone_orgrimmar.cpp src/server/scripts/Spells/spell_mage.cpp src/server/shared/Packets/ByteBuffer.h
This commit is contained in:
Vincent_Michael committed
commit
a9b740ab74
200 files changed
+1198
-473
No files matched your search
File renamed without changes.
@@ -0,0 +1,15 @@
|
||||
diff --git a/dep/acelite/ace/CMakeLists.txt b/dep/acelite/ace/CMakeLists.txt
|
||||
index eb0f6dd..1f9ffa6 100644
|
||||
--- a/dep/acelite/ace/CMakeLists.txt
|
||||
+++ b/dep/acelite/ace/CMakeLists.txt
|
||||
@@ -341,6 +341,10 @@ add_library(ace SHARED
|
||||
${ace_PCH_SRC}
|
||||
)
|
||||
|
||||
+if (MINGW) # GCC ignores "#prama comment"
|
||||
+ target_link_libraries(ace ws2_32 iphlpapi netapi32 mswsock)
|
||||
+endif()
|
||||
+
|
||||
# Generate precompiled header
|
||||
if( USE_COREPCH )
|
||||
add_cxx_pch(ace ${ace_PCH_HDR} ${ace_PCH_SRC})
|
||||
@@ -341,6 +341,10 @@ add_library(ace SHARED
|
||||
${ace_PCH_SRC}
|
||||
)
|
||||
|
||||
if (MINGW) # GCC ignores "#prama comment"
|
||||
target_link_libraries(ace ws2_32 iphlpapi netapi32 mswsock)
|
||||
endif()
|
||||
|
||||
# Generate precompiled header
|
||||
if( USE_COREPCH )
|
||||
add_cxx_pch(ace ${ace_PCH_HDR} ${ace_PCH_SRC})
|
||||
|
||||
@@ -0,0 +1,103 @@
|
||||
diff --git a/dep/g3dlite/include/G3D/platform.h b/dep/g3dlite/include/G3D/platform.h
|
||||
index 614c0ed..65616f0 100644
|
||||
--- a/dep/g3dlite/include/G3D/platform.h
|
||||
+++ b/dep/g3dlite/include/G3D/platform.h
|
||||
@@ -51,6 +51,11 @@
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#define G3D_WIN32
|
||||
+#elif defined(__MINGW32__)
|
||||
+ #define G3D_WIN32
|
||||
+ #undef __MSVCRT_VERSION__
|
||||
+ #define __MSVCRT_VERSION__ 0x0601
|
||||
+ #include <windows.h>
|
||||
#elif defined(__FreeBSD__) || defined(__OpenBSD__)
|
||||
#define G3D_FREEBSD
|
||||
#define G3D_LINUX
|
||||
diff --git a/dep/g3dlite/source/FileSystem.cpp b/dep/g3dlite/source/FileSystem.cpp
|
||||
index 76a3611..f082937 100644
|
||||
--- a/dep/g3dlite/source/FileSystem.cpp
|
||||
+++ b/dep/g3dlite/source/FileSystem.cpp
|
||||
@@ -25,8 +25,11 @@
|
||||
|
||||
// Needed for _findfirst
|
||||
# include <io.h>
|
||||
-
|
||||
-#define stat64 _stat64
|
||||
+# ifdef __MINGW32__
|
||||
+# define stat64 stat
|
||||
+# else
|
||||
+# define stat64 _stat64
|
||||
+# endif
|
||||
#else
|
||||
# include <dirent.h>
|
||||
# include <fnmatch.h>
|
||||
diff --git a/dep/g3dlite/source/RegistryUtil.cpp b/dep/g3dlite/source/RegistryUtil.cpp
|
||||
index fc4cebc..7c9e56f 100644
|
||||
--- a/dep/g3dlite/source/RegistryUtil.cpp
|
||||
+++ b/dep/g3dlite/source/RegistryUtil.cpp
|
||||
@@ -16,6 +16,15 @@
|
||||
#include "G3D/RegistryUtil.h"
|
||||
#include "G3D/System.h"
|
||||
|
||||
+#ifdef __MINGW32__
|
||||
+# ifndef HKEY_PERFORMANCE_TEXT
|
||||
+# define HKEY_PERFORMANCE_TEXT ((HKEY)((LONG)0x80000050))
|
||||
+# endif
|
||||
+# ifndef HKEY_PERFORMANCE_NLSTEXT
|
||||
+# define HKEY_PERFORMANCE_NLSTEXT ((HKEY)((LONG)0x80000060))
|
||||
+# endif
|
||||
+#endif
|
||||
+
|
||||
namespace G3D {
|
||||
|
||||
// static helpers
|
||||
diff --git a/dep/g3dlite/source/System.cpp b/dep/g3dlite/source/System.cpp
|
||||
index f6b0e03..281104d 100644
|
||||
--- a/dep/g3dlite/source/System.cpp
|
||||
+++ b/dep/g3dlite/source/System.cpp
|
||||
@@ -564,7 +564,7 @@ void System::getStandardProcessorExtensions() {
|
||||
#endif
|
||||
}
|
||||
|
||||
-#if defined(G3D_WIN32) && !defined(G3D_64BIT) /* G3DFIX: Don't check if on 64-bit Windows platforms */
|
||||
+#if defined(G3D_WIN32) && !defined(G3D_64BIT) && !defined(__MINGW32__) /* G3DFIX: Don't check if on 64-bit Windows platforms or using MinGW */
|
||||
#pragma message("Port System::memcpy SIMD to all platforms")
|
||||
/** Michael Herf's fast memcpy */
|
||||
void memcpyMMX(void* dst, const void* src, int nbytes) {
|
||||
@@ -615,7 +615,7 @@ void memcpyMMX(void* dst, const void* src, int nbytes) {
|
||||
#endif
|
||||
|
||||
void System::memcpy(void* dst, const void* src, size_t numBytes) {
|
||||
-#if defined(G3D_WIN32) && !defined(G3D_64BIT) /* G3DFIX: Don't check if on 64-bit Windows platforms */
|
||||
+#if defined(G3D_WIN32) && !defined(G3D_64BIT) && !defined(__MINGW32__) /* G3DFIX: Don't check if on 64-bit Windows platforms or using MinGW */
|
||||
memcpyMMX(dst, src, numBytes);
|
||||
#else
|
||||
::memcpy(dst, src, numBytes);
|
||||
@@ -625,7 +625,7 @@ void System::memcpy(void* dst, const void* src, size_t numBytes) {
|
||||
|
||||
/** Michael Herf's fastest memset. n32 must be filled with the same
|
||||
character repeated. */
|
||||
-#if defined(G3D_WIN32) && !defined(G3D_64BIT) /* G3DFIX: Don't check if on 64-bit Windows platforms */
|
||||
+#if defined(G3D_WIN32) && !defined(G3D_64BIT) && !defined(__MINGW32__) /* G3DFIX: Don't check if on 64-bit Windows platforms or using MinGW */
|
||||
#pragma message("Port System::memfill SIMD to all platforms")
|
||||
|
||||
// On x86 processors, use MMX
|
||||
@@ -664,7 +664,7 @@ void memfill(void *dst, int n32, unsigned long i) {
|
||||
|
||||
|
||||
void System::memset(void* dst, uint8 value, size_t numBytes) {
|
||||
-#if defined(G3D_WIN32) && !defined(G3D_64BIT) /* G3DFIX: Don't check if on 64-bit Windows platforms */
|
||||
+#if defined(G3D_WIN32) && !defined(G3D_64BIT) && !defined(__MINGW32__) /* G3DFIX: Don't check if on 64-bit Windows platforms or using MinGW */
|
||||
uint32 v = value;
|
||||
v = v + (v << 8) + (v << 16) + (v << 24);
|
||||
G3D::memfill(dst, v, numBytes);
|
||||
@@ -1696,7 +1696,7 @@ std::string System::currentDateString() {
|
||||
|
||||
// VC on Intel
|
||||
void System::cpuid(CPUIDFunction func, uint32& areg, uint32& breg, uint32& creg, uint32& dreg) {
|
||||
-#if !defined(G3D_64BIT) /* G3DFIX: Don't check if on 64-bit platform */
|
||||
+#if !defined(G3D_64BIT) && !defined(__MINGW32__) /* G3DFIX: Don't check if on 64-bit platforms or using MinGW */
|
||||
// Can't copy from assembler direct to a function argument (which is on the stack) in VC.
|
||||
uint32 a,b,c,d;
|
||||
|
||||
@@ -51,6 +51,11 @@
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#define G3D_WIN32
|
||||
#elif defined(__MINGW32__)
|
||||
#define G3D_WIN32
|
||||
#undef __MSVCRT_VERSION__
|
||||
#define __MSVCRT_VERSION__ 0x0601
|
||||
#include <windows.h>
|
||||
#elif defined(__FreeBSD__) || defined(__OpenBSD__)
|
||||
#define G3D_FREEBSD
|
||||
#define G3D_LINUX
|
||||
|
||||
@@ -25,8 +25,11 @@
|
||||
|
||||
// Needed for _findfirst
|
||||
# include <io.h>
|
||||
|
||||
#define stat64 _stat64
|
||||
# ifdef __MINGW32__
|
||||
# define stat64 stat
|
||||
# else
|
||||
# define stat64 _stat64
|
||||
# endif
|
||||
#else
|
||||
# include <dirent.h>
|
||||
# include <fnmatch.h>
|
||||
|
||||
@@ -16,6 +16,15 @@
|
||||
#include "G3D/RegistryUtil.h"
|
||||
#include "G3D/System.h"
|
||||
|
||||
#ifdef __MINGW32__
|
||||
# ifndef HKEY_PERFORMANCE_TEXT
|
||||
# define HKEY_PERFORMANCE_TEXT ((HKEY)((LONG)0x80000050))
|
||||
# endif
|
||||
# ifndef HKEY_PERFORMANCE_NLSTEXT
|
||||
# define HKEY_PERFORMANCE_NLSTEXT ((HKEY)((LONG)0x80000060))
|
||||
# endif
|
||||
#endif
|
||||
|
||||
namespace G3D {
|
||||
|
||||
// static helpers
|
||||
|
||||
@@ -564,7 +564,7 @@ void System::getStandardProcessorExtensions() {
|
||||
#endif
|
||||
}
|
||||
|
||||
#if defined(G3D_WIN32) && !defined(G3D_64BIT) /* G3DFIX: Don't check if on 64-bit Windows platforms */
|
||||
#if defined(G3D_WIN32) && !defined(G3D_64BIT) && !defined(__MINGW32__) /* G3DFIX: Don't check if on 64-bit Windows platforms or using MinGW */
|
||||
#pragma message("Port System::memcpy SIMD to all platforms")
|
||||
/** Michael Herf's fast memcpy */
|
||||
void memcpyMMX(void* dst, const void* src, int nbytes) {
|
||||
@@ -615,7 +615,7 @@ void memcpyMMX(void* dst, const void* src, int nbytes) {
|
||||
#endif
|
||||
|
||||
void System::memcpy(void* dst, const void* src, size_t numBytes) {
|
||||
#if defined(G3D_WIN32) && !defined(G3D_64BIT) /* G3DFIX: Don't check if on 64-bit Windows platforms */
|
||||
#if defined(G3D_WIN32) && !defined(G3D_64BIT) && !defined(__MINGW32__) /* G3DFIX: Don't check if on 64-bit Windows platforms or using MinGW */
|
||||
memcpyMMX(dst, src, numBytes);
|
||||
#else
|
||||
::memcpy(dst, src, numBytes);
|
||||
@@ -625,7 +625,7 @@ void System::memcpy(void* dst, const void* src, size_t numBytes) {
|
||||
|
||||
/** Michael Herf's fastest memset. n32 must be filled with the same
|
||||
character repeated. */
|
||||
#if defined(G3D_WIN32) && !defined(G3D_64BIT) /* G3DFIX: Don't check if on 64-bit Windows platforms */
|
||||
#if defined(G3D_WIN32) && !defined(G3D_64BIT) && !defined(__MINGW32__) /* G3DFIX: Don't check if on 64-bit Windows platforms or using MinGW */
|
||||
#pragma message("Port System::memfill SIMD to all platforms")
|
||||
|
||||
// On x86 processors, use MMX
|
||||
@@ -664,7 +664,7 @@ void memfill(void *dst, int n32, unsigned long i) {
|
||||
|
||||
|
||||
void System::memset(void* dst, uint8 value, size_t numBytes) {
|
||||
#if defined(G3D_WIN32) && !defined(G3D_64BIT) /* G3DFIX: Don't check if on 64-bit Windows platforms */
|
||||
#if defined(G3D_WIN32) && !defined(G3D_64BIT) && !defined(__MINGW32__) /* G3DFIX: Don't check if on 64-bit Windows platforms or using MinGW */
|
||||
uint32 v = value;
|
||||
v = v + (v << 8) + (v << 16) + (v << 24);
|
||||
G3D::memfill(dst, v, numBytes);
|
||||
@@ -1696,7 +1696,7 @@ std::string System::currentDateString() {
|
||||
|
||||
// VC on Intel
|
||||
void System::cpuid(CPUIDFunction func, uint32& areg, uint32& breg, uint32& creg, uint32& dreg) {
|
||||
#if !defined(G3D_64BIT) /* G3DFIX: Don't check if on 64-bit platform */
|
||||
#if !defined(G3D_64BIT) && !defined(__MINGW32__) /* G3DFIX: Don't check if on 64-bit platforms or using MinGW */
|
||||
// Can't copy from assembler direct to a function argument (which is on the stack) in VC.
|
||||
uint32 a,b,c,d;
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
#include "DetourAlloc.h"
|
||||
|
||||
#ifdef WIN32
|
||||
#if defined(WIN32) && !defined(__MINGW32__)
|
||||
typedef unsigned __int64 uint64;
|
||||
#else
|
||||
#include <stdint.h>
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
diff --git a/dep/recastnavigation/Detour/DetourNavMesh.h b/dep/recastnavigation/Detour/DetourNavMesh.h
|
||||
index 52d2c50..99e30c7 100644
|
||||
--- a/dep/recastnavigation/Detour/DetourNavMesh.h
|
||||
+++ b/dep/recastnavigation/Detour/DetourNavMesh.h
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
#include "DetourAlloc.h"
|
||||
|
||||
-#ifdef WIN32
|
||||
+#if defined(WIN32) && !defined(__MINGW32__)
|
||||
typedef unsigned __int64 uint64;
|
||||
#else
|
||||
#include <stdint.h>
|
||||
Reference in new issue
Block a user