feat(Core/Misc): remove and replace ACE_Singleton (#2418)

This commit is contained in:
Kargatum
2019-12-21 00:29:29 +07:00
committed by GitHub
parent 16b45bf334
commit 4a8f1de538
88 changed files with 486 additions and 250 deletions

View File

@@ -22,6 +22,12 @@ BattlefieldMgr::~BattlefieldMgr()
delete *itr;
}
BattlefieldMgr* BattlefieldMgr::instance()
{
static BattlefieldMgr instance;
return &instance;
}
void BattlefieldMgr::InitBattlefield()
{
Battlefield* pBf = new BattlefieldWG;

View File

@@ -8,7 +8,6 @@
#define BATTLEFIELD_MGR_H_
#include "Battlefield.h"
#include "ace/Singleton.h"
class Player;
class GameObject;
@@ -25,6 +24,8 @@ class BattlefieldMgr
// dtor
~BattlefieldMgr();
static BattlefieldMgr* instance();
// create battlefield events
void InitBattlefield();
// called when a player enters an battlefield area
@@ -62,6 +63,6 @@ class BattlefieldMgr
uint32 m_UpdateTimer;
};
#define sBattlefieldMgr ACE_Singleton<BattlefieldMgr, ACE_Null_Mutex>::instance()
#define sBattlefieldMgr BattlefieldMgr::instance()
#endif