summaryrefslogtreecommitdiff
path: root/src/actions
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-10-28 23:06:22 +0300
committerAndrei Karas <akaras@inbox.ru>2014-10-28 23:06:22 +0300
commit929caca446c6c3ef0d289d230068d7b264d4887f (patch)
treeb32fc6e3aba503bf24be8e743eab3c4a01d7e78d /src/actions
parent452bcb84e4dd20fb271c975b60631e704376730f (diff)
downloadmanaverse-929caca446c6c3ef0d289d230068d7b264d4887f.tar.gz
manaverse-929caca446c6c3ef0d289d230068d7b264d4887f.tar.bz2
manaverse-929caca446c6c3ef0d289d230068d7b264d4887f.tar.xz
manaverse-929caca446c6c3ef0d289d230068d7b264d4887f.zip
Fix /me command in channels and some special tabs.
Diffstat (limited to 'src/actions')
-rw-r--r--src/actions/chat.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/actions/chat.cpp b/src/actions/chat.cpp
index 3ce066c95..ac834c6f5 100644
--- a/src/actions/chat.cpp
+++ b/src/actions/chat.cpp
@@ -47,7 +47,7 @@
namespace Actions
{
-static void outString(const ChatTab *const tab,
+static void outString(ChatTab *const tab,
const std::string &str,
const std::string &def)
{
@@ -84,16 +84,18 @@ static void outString(const ChatTab *const tab,
}
break;
}
+ case ChatTabType::CHANNEL:
+ case ChatTabType::GM:
+ case ChatTabType::TRADE:
+ tab->chatInput(str);
+ break;
default:
case ChatTabType::UNKNOWN:
case ChatTabType::INPUT:
case ChatTabType::WHISPER:
case ChatTabType::DEBUG:
- case ChatTabType::TRADE:
case ChatTabType::BATTLE:
case ChatTabType::LANG:
- case ChatTabType::GM:
- case ChatTabType::CHANNEL:
chatHandler->me(def, GENERAL_CHANNEL);
break;
}