diff options
| author | megamage <none@none> | 2009-06-07 17:38:08 -0500 |
|---|---|---|
| committer | megamage <none@none> | 2009-06-07 17:38:08 -0500 |
| commit | 2e7d1d1ffcd61974533faeac409b87aa9877c9e7 (patch) | |
| tree | d82fbc2f6d4d2e8d8b9570a5e181bafa0019a283 /src/game/Player.cpp | |
| parent | f58dadb738f71cdc9cfb71d5318f5c825f2d360d (diff) | |
*Do not allow two side emote.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Player.cpp')
| -rw-r--r-- | src/game/Player.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 87462867557..c73a9b3a623 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -16779,10 +16779,8 @@ void Player::Yell(const std::string& text, const uint32 language) void Player::TextEmote(const std::string& text) { WorldPacket data(SMSG_MESSAGECHAT, 200); - BuildPlayerChat(&data, CHAT_MSG_EMOTE, text, - sWorld.getConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_CHAT) ? LANG_UNIVERSAL - : GetTeam() == ALLIANCE ? LANG_COMMON : LANG_ORCISH); - SendMessageToSetInRange(&data,sWorld.getConfig(CONFIG_LISTEN_RANGE_TEXTEMOTE),true); + BuildPlayerChat(&data, CHAT_MSG_EMOTE, text, LANG_UNIVERSAL); + SendMessageToSetInRange(&data,sWorld.getConfig(CONFIG_LISTEN_RANGE_TEXTEMOTE),true, !sWorld.getConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_CHAT)); if(sWorld.getConfig(CONFIG_CHATLOG_PUBLIC)) sLog.outChat("[TEXTEMOTE] Player %s emotes: %s", |