From 212ece4e063227c84f605af69ed97fdb2611ff1f Mon Sep 17 00:00:00 2001 From: NoFantasy Date: Thu, 16 Jul 2009 17:00:30 +0200 Subject: [PATCH] [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 --- src/game/Object.cpp | 6 +----- src/shared/revision_nr.h | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/game/Object.cpp b/src/game/Object.cpp index d3bd33a65..9ee40cc2c 100644 --- a/src/game/Object.cpp +++ b/src/game/Object.cpp @@ -1492,8 +1492,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(); @@ -1506,9 +1504,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 } diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index c5f21b0e0..8ae7fbee3 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "8186" + #define REVISION_NR "8187" #endif // __REVISION_NR_H__