ElderShell/EverWrath
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Kargatum 2019-12-21 00:29:29 +07:00 • committed by GitHub
parent 16b45bf334
commit 4a8f1de538
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
88 changed files with 486 additions and 250 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/server/game/Scripting/ScriptSystem.h
View file

@ -7,7 +7,6 @@
#define SC_SYSTEM_H
#include "ScriptMgr.h"
#include <ace/Singleton.h>
#define TEXT_SOURCE_RANGE -1000000 //the amount of entries each text source has available
@ -49,11 +48,12 @@ typedef std::vector<ScriptPointMove> ScriptPointVector;
class SystemMgr
{
friend class ACE_Singleton<SystemMgr, ACE_Null_Mutex>;
SystemMgr() {}
~SystemMgr() {}
public:
static SystemMgr* instance();
typedef std::unordered_map<uint32, ScriptPointVector> PointMoveMap;
//Database
@ -76,6 +76,6 @@ class SystemMgr
static ScriptPointVector const _empty;
};
#define sScriptSystemMgr ACE_Singleton<SystemMgr, ACE_Null_Mutex>::instance()
#define sScriptSystemMgr SystemMgr::instance()
#endif