summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-03-22 22:22:15 +0300
committerAndrei Karas <akaras@inbox.ru>2013-03-22 23:21:10 +0300
commit6b92425b46de741d4cda35027083fd988ac4e942 (patch)
tree4ea1b96d494d267ed3ceb835d611d4b095bc51f7 /src/net
parent0fcce97fe86721f4b426250a32f461ad951f6d99 (diff)
downloadmv-6b92425b46de741d4cda35027083fd988ac4e942.tar.gz
mv-6b92425b46de741d4cda35027083fd988ac4e942.tar.bz2
mv-6b92425b46de741d4cda35027083fd988ac4e942.tar.xz
mv-6b92425b46de741d4cda35027083fd988ac4e942.zip
Add option to accept language messages in any languge.
This messages will be showed in language or general tab.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/ea/chathandler.cpp7
-rw-r--r--src/net/ea/chathandler.h1
2 files changed, 5 insertions, 3 deletions
diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp
index 0118e5071..36c79af77 100644
--- a/src/net/ea/chathandler.cpp
+++ b/src/net/ea/chathandler.cpp
@@ -42,7 +42,8 @@
namespace Ea
{
-ChatHandler::ChatHandler()
+ChatHandler::ChatHandler() :
+ mShowAllLang(serverConfig.getValue("showAllLang", 0))
{
}
@@ -314,7 +315,7 @@ void ChatHandler::processBeingChat(Net::MessageIn &msg, const bool channels)
if (player_relations.hasPermission(sender_name,
PlayerRelation::SPEECH_FLOAT))
{
- being->setSpeech(chatMsg);
+ being->setSpeech(chatMsg, channel);
}
}
@@ -360,7 +361,7 @@ void ChatHandler::processChat(Net::MessageIn &msg, bool normalChat,
trim(chatMsg);
if (player_node)
- player_node->setSpeech(chatMsg);
+ player_node->setSpeech(chatMsg, channel);
}
else if (localChatTab)
{
diff --git a/src/net/ea/chathandler.h b/src/net/ea/chathandler.h
index c9bdd3029..d46b10057 100644
--- a/src/net/ea/chathandler.h
+++ b/src/net/ea/chathandler.h
@@ -88,6 +88,7 @@ class ChatHandler : public Net::ChatHandler
protected:
typedef std::queue<std::string> WhisperQueue;
WhisperQueue mSentWhispers;
+ bool mShowAllLang;
};
} // namespace Ea