Core: Move FormationMgr to namespace

Also...
- Warning fixes
- Make Singleton constructors private
This commit is contained in:
Spp
2011-09-28 11:11:38 +02:00
parent 852ffcc139
commit cc06c41887
19 changed files with 69 additions and 50 deletions
@@ -19,8 +19,11 @@
#ifndef _FORMATIONS_H
#define _FORMATIONS_H
#include "Common.h"
#include "Define.h"
#include "UnorderedMap.h"
#include <map>
class Creature;
class CreatureGroup;
struct FormationInfo
@@ -31,20 +34,16 @@ struct FormationInfo
uint8 groupAI;
};
class CreatureGroupManager
namespace FormationMgr
{
friend class ACE_Singleton<CreatureGroupManager, ACE_Null_Mutex>;
public:
void AddCreatureToGroup(uint32 group_id, Creature* creature);
void RemoveCreatureFromGroup(CreatureGroup* group, Creature* creature);
void LoadCreatureFormations();
void AddCreatureToGroup(uint32 group_id, Creature* creature);
void RemoveCreatureFromGroup(CreatureGroup* group, Creature* creature);
void LoadCreatureFormations();
};
#define sFormationMgr ACE_Singleton<CreatureGroupManager, ACE_Null_Mutex>::instance()
typedef UNORDERED_MAP<uint32/*memberDBGUID*/, FormationInfo*> CreatureGroupInfoType;
extern CreatureGroupInfoType CreatureGroupMap;
extern CreatureGroupInfoType CreatureGroupMap;
class CreatureGroup
{
@@ -59,7 +58,7 @@ class CreatureGroup
public:
//Group cannot be created empty
explicit CreatureGroup(uint32 id) : m_leader(NULL), m_groupID(id), m_Formed(false) {}
~CreatureGroup() { sLog->outDebug(LOG_FILTER_UNITS, "Destroying group"); }
~CreatureGroup() {}
Creature* getLeader() const { return m_leader; }
uint32 GetId() const { return m_groupID; }