yolinlin/mod-ale
1
0
Fork 0
mirror of https://github.com/azerothcore/mod-ale synced 2025-11-29 15:38:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Eluna fix mangos compilation

Browse Source
This commit is contained in:
Rochet2
2018-01-15 22:19:17 +02:00
parent 0aef6217af
commit 346d88dd5e
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ElunaIncludes.h
View File

@@ -15,6 +15,7 @@
#include "Chat.h" #include "Chat.h"
#include "Channel.h" #include "Channel.h"
#include "DBCStores.h" #include "DBCStores.h"
#include "GameEventMgr.h"
#include "GossipDef.h" #include "GossipDef.h"
#include "GridNotifiers.h" #include "GridNotifiers.h"
#include "GridNotifiersImpl.h" #include "GridNotifiersImpl.h"
@@ -117,6 +118,7 @@ typedef Opcodes OpcodesList;
#define eObjectMgr (&sObjectMgr) #define eObjectMgr (&sObjectMgr)
#define eAccountMgr (&sAccountMgr) #define eAccountMgr (&sAccountMgr)
#define eAuctionMgr (&sAuctionMgr) #define eAuctionMgr (&sAuctionMgr)
#define eGameEventMgr (&sGameEventMgr)
#define eObjectAccessor() sObjectAccessor. #define eObjectAccessor() sObjectAccessor.
#define SERVER_MSG_STRING SERVER_MSG_CUSTOM #define SERVER_MSG_STRING SERVER_MSG_CUSTOM
#define TOTAL_LOCALES MAX_LOCALE #define TOTAL_LOCALES MAX_LOCALE

14
GlobalMethods.h
View File

@@ -468,7 +468,6 @@ namespace LuaGlobalFunctions
return 1; return 1;
} }
#ifdef TRINITY
/** /**
* Returns the currently active game events. * Returns the currently active game events.
* *
@@ -479,7 +478,7 @@ namespace LuaGlobalFunctions
lua_newtable(L); lua_newtable(L);
int tbl = lua_gettop(L); int tbl = lua_gettop(L);
uint32 counter = 1; uint32 counter = 1;
GameEventMgr::ActiveEvents const& activeEvents = sGameEventMgr->GetActiveEventList(); GameEventMgr::ActiveEvents const& activeEvents = eGameEventMgr->GetActiveEventList();
for (GameEventMgr::ActiveEvents::const_iterator i = activeEvents.begin(); i != activeEvents.end(); ++i) for (GameEventMgr::ActiveEvents::const_iterator i = activeEvents.begin(); i != activeEvents.end(); ++i)
{ {
@@ -492,7 +491,6 @@ namespace LuaGlobalFunctions
lua_settop(L, tbl); lua_settop(L, tbl);
return 1; return 1;
} }
#endif
static int RegisterEntryHelper(lua_State* L, int regtype) static int RegisterEntryHelper(lua_State* L, int regtype)
{ {
@@ -2383,7 +2381,6 @@ namespace LuaGlobalFunctions
return 1; return 1;
} }
#ifdef TRINITY
/** /**
* Returns `true` if the event is currently active, otherwise `false`. * Returns `true` if the event is currently active, otherwise `false`.
* *
@@ -2394,10 +2391,9 @@ namespace LuaGlobalFunctions
{ {
uint16 eventId = Eluna::CHECKVAL<uint16>(L, 1); uint16 eventId = Eluna::CHECKVAL<uint16>(L, 1);
Eluna::Push(L, sGameEventMgr->IsActiveEvent(eventId)); Eluna::Push(L, eGameEventMgr->IsActiveEvent(eventId));
return 1; return 1;
} }
#endif
/** /**
* Returns the server's current time. * Returns the server's current time.
@@ -2469,7 +2465,6 @@ namespace LuaGlobalFunctions
return 0; return 0;
} }
#ifdef TRINITY
/** /**
* Starts the event by eventId, if force is set, the event will force start regardless of previous event state. * Starts the event by eventId, if force is set, the event will force start regardless of previous event state.
* *
@@ -2481,7 +2476,7 @@ namespace LuaGlobalFunctions
uint16 eventId = Eluna::CHECKVAL<uint16>(L, 1); uint16 eventId = Eluna::CHECKVAL<uint16>(L, 1);
bool force = Eluna::CHECKVAL<bool>(L, 2, false); bool force = Eluna::CHECKVAL<bool>(L, 2, false);
sGameEventMgr->StartEvent(eventId, force); eGameEventMgr->StartEvent(eventId, force);
return 0; return 0;
} }
@@ -2496,10 +2491,9 @@ namespace LuaGlobalFunctions
uint16 eventId = Eluna::CHECKVAL<uint16>(L, 1); uint16 eventId = Eluna::CHECKVAL<uint16>(L, 1);
bool force = Eluna::CHECKVAL<bool>(L, 2, false); bool force = Eluna::CHECKVAL<bool>(L, 2, false);
sGameEventMgr->StopEvent(eventId, force); eGameEventMgr->StopEvent(eventId, force);
return 0; return 0;
} }
#endif
/** /**
* Returns an object representing a `long long` (64-bit) value. * Returns an object representing a `long long` (64-bit) value.