diff options
Diffstat (limited to 'src/game/ObjectMgr.h')
| -rw-r--r-- | src/game/ObjectMgr.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/game/ObjectMgr.h b/src/game/ObjectMgr.h index bb2866d55c7..954bb6dbe61 100644 --- a/src/game/ObjectMgr.h +++ b/src/game/ObjectMgr.h @@ -296,9 +296,10 @@ class ObjectMgr typedef UNORDERED_MAP<uint32, Item*> ItemMap; typedef std::set< Group * > GroupSet; - typedef std::set< Guild * > GuildSet; - typedef UNORDERED_MAP<uint32, ArenaTeam* > ArenaTeamMap; + typedef UNORDERED_MAP<uint32, Guild *> GuildMap; + + typedef UNORDERED_MAP<uint32, ArenaTeam*> ArenaTeamMap; typedef UNORDERED_MAP<uint32, Quest*> QuestMap; @@ -334,14 +335,14 @@ class ObjectMgr Guild* GetGuildById(const uint32 GuildId) const; Guild* GetGuildByName(const std::string& guildname) const; std::string GetGuildNameById(const uint32 GuildId) const; - void AddGuild(Guild* guild) { mGuildSet.insert( guild ); } - void RemoveGuild(Guild* guild) { mGuildSet.erase( guild ); } + void AddGuild(Guild* guild); + void RemoveGuild(uint32 Id); ArenaTeam* GetArenaTeamById(const uint32 arenateamid) const; ArenaTeam* GetArenaTeamByName(const std::string& arenateamname) const; ArenaTeam* GetArenaTeamByCaptain(uint64 const& guid) const; void AddArenaTeam(ArenaTeam* arenaTeam); - void RemoveArenaTeam(ArenaTeam* arenaTeam); + void RemoveArenaTeam(uint32 Id); ArenaTeamMap::iterator GetArenaTeamMapBegin() { return mArenaTeamMap.begin(); } ArenaTeamMap::iterator GetArenaTeamMapEnd() { return mArenaTeamMap.end(); } @@ -804,7 +805,7 @@ class ObjectMgr typedef std::set<uint32> GameObjectForQuestSet; GroupSet mGroupSet; - GuildSet mGuildSet; + GuildMap mGuildMap; ArenaTeamMap mArenaTeamMap; ItemMap mItems; |