aboutsummaryrefslogtreecommitdiff
path: root/src/game/CreatureGroups.h
diff options
context:
space:
mode:
authormegamage <none@none>2009-01-16 22:59:24 -0600
committermegamage <none@none>2009-01-16 22:59:24 -0600
commitfa2e6622ad9dca5051b451e14ea303670ec65fa6 (patch)
tree585a7216408a60c43037244c96b2be7bceffa568 /src/game/CreatureGroups.h
parent11239e9f5f9bf63e1ec07bb348b054accebd5b56 (diff)
parent0a1c601a1cc0e0036ad8fbfce68d87d14fa572d0 (diff)
*Merge.
--HG-- branch : trunk
Diffstat (limited to 'src/game/CreatureGroups.h')
-rw-r--r--src/game/CreatureGroups.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/game/CreatureGroups.h b/src/game/CreatureGroups.h
index 0f4474106de..dd7da865955 100644
--- a/src/game/CreatureGroups.h
+++ b/src/game/CreatureGroups.h
@@ -58,7 +58,9 @@ class CreatureGroup
bool isEmpty() {return CreatureGroupMembers.empty();}
};
-extern UNORDERED_MAP<uint32, CreatureGroup*> CreatureGroupHolder;
+typedef UNORDERED_MAP<uint32, CreatureGroup*> CreatureGroupHolderType;
+
+extern CreatureGroupHolderType CreatureGroupHolder;
extern UNORDERED_MAP<uint32, FormationMember*> CreatureGroupMap;
#define formation_mgr Trinity::Singleton<CreatureGroupManager>::Instance()