summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-01-14 17:27:52 +0300
committerAndrei Karas <akaras@inbox.ru>2015-01-14 17:27:52 +0300
commit0381a0de69cc21c8886fb0a68cda450d3135d55a (patch)
tree7c9883d4043b925b9148715664b621876c680d20 /src/net
parentecac984465f2a9f51940515abdf7552e5c6341a1 (diff)
downloadmanaplus-0381a0de69cc21c8886fb0a68cda450d3135d55a.tar.gz
manaplus-0381a0de69cc21c8886fb0a68cda450d3135d55a.tar.bz2
manaplus-0381a0de69cc21c8886fb0a68cda450d3135d55a.tar.xz
manaplus-0381a0de69cc21c8886fb0a68cda450d3135d55a.zip
For trade tab use channel to send messages.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/eathena/chathandler.cpp5
-rw-r--r--src/net/tmwa/chathandler.cpp8
2 files changed, 10 insertions, 3 deletions
diff --git a/src/net/eathena/chathandler.cpp b/src/net/eathena/chathandler.cpp
index 3def53afd..456bda0e5 100644
--- a/src/net/eathena/chathandler.cpp
+++ b/src/net/eathena/chathandler.cpp
@@ -194,7 +194,10 @@ void ChatHandler::privateMessage(const std::string &restrict recipient,
void ChatHandler::channelMessage(const std::string &restrict channel,
const std::string &restrict text)
{
- privateMessage(channel, text);
+ if (channel == TRADE_CHANNEL)
+ talk("\302\202" + text, GENERAL_CHANNEL);
+ else
+ privateMessage(channel, text);
}
void ChatHandler::who() const
diff --git a/src/net/tmwa/chathandler.cpp b/src/net/tmwa/chathandler.cpp
index dafa31cf5..a48aa5426 100644
--- a/src/net/tmwa/chathandler.cpp
+++ b/src/net/tmwa/chathandler.cpp
@@ -26,6 +26,8 @@
#include "being/localplayer.h"
+#include "gui/chatconsts.h"
+
#include "gui/widgets/tabs/chat/chattab.h"
#include "gui/windows/chatwindow.h"
@@ -163,9 +165,11 @@ void ChatHandler::privateMessage(const std::string &restrict recipient,
mSentWhispers.push(recipient);
}
-void ChatHandler::channelMessage(const std::string &restrict channel A_UNUSED,
- const std::string &restrict text A_UNUSED)
+void ChatHandler::channelMessage(const std::string &restrict channel,
+ const std::string &restrict text)
{
+ if (channel == TRADE_CHANNEL)
+ talk("\302\202" + text, GENERAL_CHANNEL);
}
void ChatHandler::who() const