diff options
| author | megamage <none@none> | 2009-06-07 15:46:18 -0500 |
|---|---|---|
| committer | megamage <none@none> | 2009-06-07 15:46:18 -0500 |
| commit | b10b65109670efa3e5f967543775c5ab8726f47c (patch) | |
| tree | 99c2aec380f0e3c790ef1a651d693c898dd1d724 | |
| parent | 0077a00852c46789ca4903ee50acbe454286cb7a (diff) | |
*Do not allow two side emote.
--HG--
branch : trunk
| -rw-r--r-- | src/game/Player.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/game/Player.cpp b/src/game/Player.cpp index c73a9b3a623..87462867557 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -16779,8 +16779,10 @@ 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, LANG_UNIVERSAL); - SendMessageToSetInRange(&data,sWorld.getConfig(CONFIG_LISTEN_RANGE_TEXTEMOTE),true, !sWorld.getConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_CHAT)); + 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); if(sWorld.getConfig(CONFIG_CHATLOG_PUBLIC)) sLog.outChat("[TEXTEMOTE] Player %s emotes: %s", |