diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-03-20 12:33:04 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-03-21 21:09:08 +0300 |
| commit | 54ee7d240a8ab3a328d0f3f06f3b9627d4727c90 (patch) | |
| tree | a50136462b44739cecf17c438ed65640d031dbcd /src/gui | |
| parent | c483cf600e74e7d38a7c0cc7d80435e97040c76c (diff) | |
| download | manaverse-54ee7d240a8ab3a328d0f3f06f3b9627d4727c90.tar.gz manaverse-54ee7d240a8ab3a328d0f3f06f3b9627d4727c90.tar.bz2 manaverse-54ee7d240a8ab3a328d0f3f06f3b9627d4727c90.tar.xz manaverse-54ee7d240a8ab3a328d0f3f06f3b9627d4727c90.zip | |
Send channel name to net code layer.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/shopwindow.cpp | 2 | ||||
| -rw-r--r-- | src/gui/widgets/chattab.cpp | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/gui/shopwindow.cpp b/src/gui/shopwindow.cpp index d42583f62..ffe347099 100644 --- a/src/gui/shopwindow.cpp +++ b/src/gui/shopwindow.cpp @@ -491,7 +491,7 @@ void ShopWindow::announce(ShopItems *const list, const int mode) } } - Net::getChatHandler()->talk(data); + Net::getChatHandler()->talk(data, GENERAL_CHANNEL); } void ShopWindow::giveList(const std::string &nick, const int mode) diff --git a/src/gui/widgets/chattab.cpp b/src/gui/widgets/chattab.cpp index 2b360789a..f219bb661 100644 --- a/src/gui/widgets/chattab.cpp +++ b/src/gui/widgets/chattab.cpp @@ -412,9 +412,14 @@ void ChatTab::clearText() void ChatTab::handleInput(const std::string &msg) { if (chatWindow) - Net::getChatHandler()->talk(chatWindow->doReplace(msg)); + { + Net::getChatHandler()->talk(chatWindow->doReplace(msg), + mChannelName); + } else - Net::getChatHandler()->talk(msg); + { + Net::getChatHandler()->talk(msg, mChannelName); + } } void ChatTab::handleCommand(const std::string &msg) |