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

@@ -63,6 +63,12 @@ class PlayerTextBuilder
WorldObject const* _target;
};
CreatureTextMgr* CreatureTextMgr::instance()
{
static CreatureTextMgr instance;
return &instance;
}
void CreatureTextMgr::LoadCreatureTexts()
{
uint32 oldMSTime = getMSTime();

View File

@@ -72,10 +72,11 @@ typedef std::unordered_map<uint64, CreatureTextRepeatGroup> CreatureTextRepeatMa
class CreatureTextMgr
{
friend class ACE_Singleton<CreatureTextMgr, ACE_Null_Mutex>;
CreatureTextMgr() { }
public:
static CreatureTextMgr* instance();
~CreatureTextMgr() { }
void LoadCreatureTexts();
void LoadCreatureTextLocales();
@@ -103,7 +104,7 @@ class CreatureTextMgr
LocaleCreatureTextMap mLocaleTextMap;
};
#define sCreatureTextMgr ACE_Singleton<CreatureTextMgr, ACE_Null_Mutex>::instance()
#define sCreatureTextMgr CreatureTextMgr::instance()
template<class Builder>
class CreatureTextLocalizer