Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-19 17:05:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[svn] Merge from mangos.

Browse Source 
Wed Oct 29 15:06:00 034b8a34a9
Mon Oct 27 14:36:42 fa072d1510

--HG--
branch : trunk
This commit is contained in:
megamage
2008-10-29 18:06:01 -05:00
parent cca2c3a603
commit 7ea14f94f1
5 changed files with 113 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/game/ObjectMgr.cpp
View File

@@ -6784,11 +6784,17 @@ GameTele const* ObjectMgr::GetGameTele(std::string name) const
// converting string that we try to find to lower case
wstrToLower( wname );
// Alternative first GameTele what contains wnameLow as substring in case no GameTele location found
const GameTele* alt = NULL;
for(GameTeleMap::const_iterator itr = m_GameTeleMap.begin(); itr != m_GameTeleMap.end(); ++itr)
{
if(itr->second.wnameLow == wname)
return &itr->second;
else if (alt == NULL && itr->second.wnameLow.find(wname) != std::wstring::npos)
alt = &itr->second;
}
return NULL;
return alt;
}
bool ObjectMgr::AddGameTele(GameTele& tele)