diff options
| author | n0n4m3 <none@none> | 2009-12-20 17:39:36 +0100 |
|---|---|---|
| committer | n0n4m3 <none@none> | 2009-12-20 17:39:36 +0100 |
| commit | cc19e731742420615bc7c68144b100b07298fad0 (patch) | |
| tree | f382525179450cb425c4ad9cf3d6444a4cee1f93 /src/game/Chat.cpp | |
| parent | 851a514f90355d00661b2fd60853ed4623b4b26a (diff) | |
| parent | a85544cb9c51e412169afe82a63cec602f71b1bd (diff) | |
Merge
--HG--
branch : trunk
Diffstat (limited to 'src/game/Chat.cpp')
| -rw-r--r-- | src/game/Chat.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/game/Chat.cpp b/src/game/Chat.cpp index 2bb7533c4ae..b93462802b8 100644 --- a/src/game/Chat.cpp +++ b/src/game/Chat.cpp @@ -2081,8 +2081,8 @@ GameObject* ChatHandler::GetObjectGlobalyWithGuidOrNearWithDbGuid(uint32 lowguid Cell cell(p); cell.data.Part.reserved = ALL_DISTRICT; - MaNGOS::GameObjectWithDbGUIDCheck go_check(*pl,lowguid); - MaNGOS::GameObjectSearcher<MaNGOS::GameObjectWithDbGUIDCheck> checker(pl,obj,go_check); + Trinity::GameObjectWithDbGUIDCheck go_check(*pl,lowguid); + Trinity::GameObjectSearcher<Trinity::GameObjectWithDbGUIDCheck> checker(pl,obj,go_check); TypeContainerVisitor<Trinity::GameObjectSearcher<Trinity::GameObjectWithDbGUIDCheck>, GridTypeMapContainer > object_checker(checker); CellLock<GridReadGuard> cell_lock(cell, p); @@ -2363,7 +2363,7 @@ int ChatHandler::GetSessionDbLocaleIndex() const return m_session->GetSessionDbLocaleIndex(); } -const char *CliHandler::GetMangosString(int32 entry) const +const char *CliHandler::GetTrinityString(int32 entry) const { return objmgr.GetTrinityStringForDBCLocale(entry); } |