mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-27 10:37:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Sync] Some minor project sync

Browse source
This commit is contained in:
Antz 2017-01-09 21:35:12 +00:00 • committed by Antz
parent 7332173b6e
commit 461923f632
35 changed files with 3690 additions and 1585 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/framework/GameSystem/Grid.h
View file

@ -130,7 +130,7 @@ class Grid
*/
bool AddGridObject(SPECIFIC_OBJECT* obj)
{
if (obj->isActiveObject())
if (obj->IsActiveObject())
{ m_activeGridObjects.insert(obj); }
return i_container.template insert<SPECIFIC_OBJECT>(obj);
@ -145,7 +145,7 @@ class Grid
*/
bool RemoveGridObject(SPECIFIC_OBJECT* obj)
{
if (obj->isActiveObject())
if (obj->IsActiveObject())
{ m_activeGridObjects.erase(obj); }
return i_container.template remove<SPECIFIC_OBJECT>(obj);

15
src/framework/Platform/Define.h
View file

@ -64,20 +64,9 @@ typedef ACE_SHLIB_HANDLE MANGOS_LIBRARY_HANDLE;
# define MANGOS_EXPORT __declspec(dllexport)
# define MANGOS_IMPORT __cdecl
#else // PLATFORM != PLATFORM_WINDOWS
# include <dlfcn.h>
typedef void* MANGOS_LIBRARY_HANDLE;
# define MANGOS_LOAD_LIBRARY(libname) dlopen(libname, RTLD_LAZY)
# define MANGOS_CLOSE_LIBRARY(hlib) dlclose(hlib)
# define MANGOS_GET_PROC_ADDR(hlib, name) dlsym(hlib, name)
# define MANGOS_EXPORT export
# if PLATFORM == PLATFORM_APPLE
# define MANGOS_SCRIPT_SUFFIX ".dylib"
# else
# define MANGOS_SCRIPT_SUFFIX ".so"
# endif
# define MANGOS_SCRIPT_PREFIX "lib"
# if defined(__APPLE_CC__) && defined(BIG_ENDIAN) // TODO:: more work to do with byte order. Have to be rechecked after boost integration.
# if (defined (__ppc__) || defined (__powerpc__))
# if defined(__APPLE_CC__) && defined(BIG_ENDIAN)
# if (defined(__ppc__) || defined(__powerpc__))
# define MANGOS_IMPORT __attribute__ ((longcall))
# else
# define MANGOS_IMPORT