From cb48363788fab7648f7fd315e19df2f0dcabb903 Mon Sep 17 00:00:00 2001 From: megamage Date: Mon, 20 Jul 2009 11:53:26 +0800 Subject: [8187] Remove %s prefix in BuildMonsterChat(). For cases where name of sender is expected to show in client chat (mainly emote texts), add %s to the text where name should display. Signed-off-by: NoFantasy --HG-- branch : trunk --- src/game/Object.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/game/Object.cpp') diff --git a/src/game/Object.cpp b/src/game/Object.cpp index afe477f3310..5b5ffc350a9 100644 --- a/src/game/Object.cpp +++ b/src/game/Object.cpp @@ -1623,8 +1623,6 @@ void WorldObject::MonsterWhisper(int32 textId, uint64 receiver, bool IsBossWhisp void WorldObject::BuildMonsterChat(WorldPacket *data, uint8 msgtype, char const* text, uint32 language, char const* name, uint64 targetGuid) const { - bool pre = (msgtype==CHAT_MSG_MONSTER_EMOTE || msgtype==CHAT_MSG_RAID_BOSS_EMOTE); - *data << (uint8)msgtype; *data << (uint32)language; *data << (uint64)GetGUID(); @@ -1637,9 +1635,7 @@ void WorldObject::BuildMonsterChat(WorldPacket *data, uint8 msgtype, char const* *data << (uint32)1; // target name length *data << (uint8)0; // target name } - *data << (uint32)(strlen(text)+1+(pre?3:0)); - if(pre) - data->append("%s ",3); + *data << (uint32)(strlen(text)+1); *data << text; *data << (uint8)0; // ChatTag } -- cgit v1.2.3