server/mangos
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add game event hooks and update eluna version

Browse Source
This commit is contained in:
Rochet2 2017-09-29 01:01:30 +03:00 committed by Antz
parent d77090b14e
commit 852b6768cd
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/game/WorldHandlers/GameEventMgr.cpp
View File

@ -34,6 +34,7 @@
#include "BattleGround/BattleGroundMgr.h"
#include "MassMailMgr.h"
#include "Policies/Singleton.h"
#include "LuaEngine.h"
INSTANTIATE_SINGLETON_1(GameEventMgr);
@ -82,6 +83,8 @@ void GameEventMgr::StartEvent(uint16 event_id, bool overwrite /*=false*/, bool r
if (mGameEvent[event_id].end <= mGameEvent[event_id].start)
{ mGameEvent[event_id].end = mGameEvent[event_id].start + mGameEvent[event_id].length; }
}
if (IsActiveEvent(event_id))
sEluna->OnGameEventStart(event_id);
}
void GameEventMgr::StopEvent(uint16 event_id, bool overwrite)
@ -93,6 +96,8 @@ void GameEventMgr::StopEvent(uint16 event_id, bool overwrite)
if (mGameEvent[event_id].end <= mGameEvent[event_id].start)
{ mGameEvent[event_id].end = mGameEvent[event_id].start + mGameEvent[event_id].length; }
}
if (!IsActiveEvent(event_id))
sEluna->OnGameEventStop(event_id);
}
void GameEventMgr::LoadFromDB()

2
src/modules/Eluna

@ -1 +1 @@
Subproject commit 00eef91aa2acd95719a18c6c6b1bb03d8b4919fe
Subproject commit cd5a55522574b9d74f7abb32cd8512b1d4234753