[svn] *** Source: MaNGOS ***

* Implement localization of creature/gameobject name that say/yell. Author: evilstar (rewrited by: Vladimir)
* Fix auth login queue. Author: Derex
* Allowed switching INVTYPE_HOLDABLE items during combat, used correct spells for triggering global cooldown at weapon switch. Author: mobel/simak
* Fixed some format arg type/value pairs. Other warnings. Author: Vladimir
* [238_world.sql] Allow have team dependent graveyards at entrance map for instances. Author: Vladimir

NOTE:
Entrance map graveyards selected by same way as local (by distance from entrance) Until DB support will work in old way base at current DB data.

--HG--
branch : trunk

1 files changed, 2 insertions, 2 deletions

diff --git a/src/game/Object.cpp b/src/game/Object.cpp
index 0ceb71367ca..ea59a448f7f 100644
--- a/src/game/Object.cpp
+++ b/src/game/Object.cpp
@@ -1280,7 +1280,7 @@ namespace Trinity
                     data = new WorldPacket(SMSG_MESSAGECHAT, 200);
 
                     // TODO: i_object.GetName() also must be localized?
-                    i_object.BuildMonsterChat(data,i_msgtype,text,i_language,i_object.GetName(),i_targetGUID);
+                    i_object.BuildMonsterChat(data,i_msgtype,text,i_language,i_object.GetNameForLocaleIdx(loc_idx),i_targetGUID);
 
                     i_data_cache[cache_idx] = data;
                 }
@@ -1545,4 +1545,4 @@ void WorldObject::GetNearPoint(WorldObject const* searcher, float &x, float &y,
 	z = GetPositionZ();
 
 	UpdateGroundPositionZ(x,y,z);
-}
\ No newline at end of file
+}