Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 02:04:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:TrinityCore/TrinityCore into boost

Browse Source 
Conflicts:
	src/server/game/Battlegrounds/BattlegroundMgr.h
This commit is contained in:
Subv
2014-07-13 17:35:16 -05:00
parent dfdc19f3bc 28e0f92229
commit aeaed5f007
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/server/game/Battlegrounds/BattlegroundMgr.h
View File

@@ -23,7 +23,6 @@
#include "DBCEnums.h"
#include "Battleground.h"
#include "BattlegroundQueue.h"
#include <ace/Singleton.h>
typedef std::map<uint32, Battleground*> BattlegroundContainer;
typedef std::set<uint32> BattlegroundClientIdsContainer;
@@ -58,13 +57,17 @@ struct BattlegroundTemplate
class BattlegroundMgr
{
friend class ACE_Singleton<BattlegroundMgr, ACE_Null_Mutex>;
private:
BattlegroundMgr();
~BattlegroundMgr();
public:
static BattlegroundMgr* instance()
{
static BattlegroundMgr* instance = new BattlegroundMgr();
return instance;
}
void Update(uint32 diff);
/* Packet Building */
@@ -171,6 +174,6 @@ class BattlegroundMgr
BattlegroundMapTemplateContainer _battlegroundMapTemplates;
};
#define sBattlegroundMgr ACE_Singleton<BattlegroundMgr, ACE_Null_Mutex>::instance()
#define sBattlegroundMgr BattlegroundMgr::instance()
#endif // __BATTLEGROUNDMGR_H