Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-24 02:46:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/ObjectMgr: Use a map rather than a vector for indexing guilds by their guid (might contain large gaps).

Browse Source
This commit is contained in:
leak
2011-03-11 00:18:18 +01:00
parent 0aa015d897
commit 4f892bbba1
2 changed files with 16 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/server/game/Globals/ObjectMgr.cpp
View File

@@ -298,8 +298,7 @@ ObjectMgr::~ObjectMgr()
delete *itr;
for (GuildMap::iterator itr = mGuildMap.begin(); itr != mGuildMap.end(); ++itr)
if (*itr)
delete *itr;
delete itr->second;
for (ArenaTeamMap::iterator itr = mArenaTeamMap.begin(); itr != mArenaTeamMap.end(); ++itr)
delete itr->second;
@@ -332,9 +331,10 @@ Group* ObjectMgr::GetGroupByStorageId(uint32 storageId) const
// Guild collection
Guild* ObjectMgr::GetGuildById(uint32 guildId) const
{
// Make sure given index exists in collection
if (guildId < uint32(mGuildMap.size()))
return mGuildMap[guildId];
GuildMap::const_iterator itr = mGuildMap.find(guildId);
if (itr != mGuildMap.end())
return itr->second;
return NULL;
}
@@ -344,13 +344,10 @@ Guild* ObjectMgr::GetGuildByName(const std::string& guildname) const
std::transform(search.begin(), search.end(), search.begin(), ::toupper);
for (GuildMap::const_iterator itr = mGuildMap.begin(); itr != mGuildMap.end(); ++itr)
{
if (*itr)
{
std::string gname = (*itr)->GetName();
std::transform(gname.begin(), gname.end(), gname.begin(), ::toupper);
if (search == gname)
return *itr;
}
std::string gname = itr->second->GetName();
std::transform(gname.begin(), gname.end(), gname.begin(), ::toupper);
if (search == gname)
return itr->second;
}
return NULL;
}
@@ -365,29 +362,20 @@ std::string ObjectMgr::GetGuildNameById(uint32 guildId) const
Guild* ObjectMgr::GetGuildByLeader(const uint64 &guid) const
{
for (GuildMap::const_iterator itr = mGuildMap.begin(); itr != mGuildMap.end(); ++itr)
if ((*itr) && (*itr)->GetLeaderGUID() == guid)
return *itr;
if (itr->second->GetLeaderGUID() == guid)
return itr->second;
return NULL;
}
void ObjectMgr::AddGuild(Guild* pGuild)
void ObjectMgr::AddGuild(Guild* guild)
{
uint32 guildId = pGuild->GetId();
// Allocate space if necessary
if (guildId >= uint32(mGuildMap.size()))
// Reserve a bit more space than necessary.
// 16 is intentional and it will allow creation of next 16 guilds happen
// without reallocation.
mGuildMap.resize(guildId + 16);
mGuildMap[guildId] = pGuild;
mGuildMap[guild->GetId()] = guild;
}
void ObjectMgr::RemoveGuild(uint32 guildId)
{
// Make sure given index exists
if (guildId < uint32(mGuildMap.size()))
mGuildMap[guildId] = NULL;
mGuildMap.erase(guildId);
}
// Arena teams collection
@@ -3676,8 +3664,6 @@ void ObjectMgr::LoadGuilds()
}
else
{
mGuildMap.resize(m_guildId, NULL); // Reserve space and initialize storage for loading guilds //TODOLEAK: fix this shit
uint32 count = 0;
do
{
@@ -3968,7 +3954,7 @@ void ObjectMgr::LoadGuilds()
for (GuildMap::iterator itr = mGuildMap.begin(); itr != mGuildMap.end(); ++itr)
{
Guild* pGuild = *itr;
Guild* pGuild = itr->second;
if (pGuild)
{
if (!pGuild->Validate())

2
src/server/game/Globals/ObjectMgr.h
View File

@@ -594,7 +594,7 @@ class ObjectMgr
typedef std::set<Group *> GroupSet;
typedef std::vector<Group *> GroupStorage;
typedef std::vector <Guild *> GuildMap;
typedef UNORDERED_MAP<uint32, Guild*> GuildMap;
typedef UNORDERED_MAP<uint32, ArenaTeam*> ArenaTeamMap;