From d390ff46c22929591cd1cf5a8021055c62a678ea Mon Sep 17 00:00:00 2001 From: Machiavelli Date: Thu, 13 May 2010 20:04:36 +0200 Subject: Make ObjectMgr::GetGuildByName and ObjectMgr::GetArenaTeamByName searches case insensitive. Fixes issue #307. Credits to Loread --HG-- branch : trunk --- src/game/ObjectMgr.cpp | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'src/game/ObjectMgr.cpp') diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp index 8878d636e37..962c3f76ee6 100644 --- a/src/game/ObjectMgr.cpp +++ b/src/game/ObjectMgr.cpp @@ -240,10 +240,15 @@ Guild * ObjectMgr::GetGuildById(uint32 GuildId) const Guild * ObjectMgr::GetGuildByName(const std::string& guildname) const { + std::string search = guildname; + std::transform(search.begin(), search.end(), search.begin(), toupper); for (GuildMap::const_iterator itr = mGuildMap.begin(); itr != mGuildMap.end(); ++itr) - if (itr->second->GetName() == guildname) + { + std::string gname = itr->second->GetName(); + std::transform(gname.begin(), gname.end(), gname.begin(), toupper); + if (search == gname) return itr->second; - + } return NULL; } @@ -286,10 +291,15 @@ ArenaTeam* ObjectMgr::GetArenaTeamById(uint32 arenateamid) const ArenaTeam* ObjectMgr::GetArenaTeamByName(const std::string& arenateamname) const { + std::string search = arenateamname; + std::transform(search.begin(), search.end(), search.begin(), toupper); for (ArenaTeamMap::const_iterator itr = mArenaTeamMap.begin(); itr != mArenaTeamMap.end(); ++itr) - if (itr->second->GetName() == arenateamname) + { + std::string teamname = itr->second->GetName(); + std::transform(teamname.begin(), teamname.end(), teamname.begin(), toupper); + if (search == teamname) return itr->second; - + } return NULL; } -- cgit v1.2.3