summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-01-11 17:00:44 +0300
committerAndrei Karas <akaras@inbox.ru>2015-01-11 17:00:44 +0300
commit2791fac578c27f6dafc8d5fcebc7f281424285d6 (patch)
tree5852a9b26901c5461619a595738423321e044e05
parent36345952f734b410e745ccfe093b9c12cc65c4fe (diff)
downloadmv-2791fac578c27f6dafc8d5fcebc7f281424285d6.tar.gz
mv-2791fac578c27f6dafc8d5fcebc7f281424285d6.tar.bz2
mv-2791fac578c27f6dafc8d5fcebc7f281424285d6.tar.xz
mv-2791fac578c27f6dafc8d5fcebc7f281424285d6.zip
Add chat command for select guild chat tab.
New chat command: /guildtab Alias: /guildchattab
-rw-r--r--src/actions/chat.cpp7
-rw-r--r--src/actions/chat.h1
-rw-r--r--src/input/inputaction.h1
-rw-r--r--src/input/inputactionmap.h5
4 files changed, 14 insertions, 0 deletions
diff --git a/src/actions/chat.cpp b/src/actions/chat.cpp
index 3091bb108..cacafea5b 100644
--- a/src/actions/chat.cpp
+++ b/src/actions/chat.cpp
@@ -513,4 +513,11 @@ impHandler0(chatPartyTab)
return true;
}
+impHandler0(chatGuildTab)
+{
+ if (chatWindow)
+ chatWindow->selectTabByType(ChatTabType::GUILD);
+ return true;
+}
+
} // namespace Actions
diff --git a/src/actions/chat.h b/src/actions/chat.h
index b8e0cd5b3..1aa1778ef 100644
--- a/src/actions/chat.h
+++ b/src/actions/chat.h
@@ -56,6 +56,7 @@ namespace Actions
decHandler(chatLangTab);
decHandler(chatGmTab);
decHandler(chatPartyTab);
+ decHandler(chatGuildTab);
} // namespace Actions
#undef decHandler
diff --git a/src/input/inputaction.h b/src/input/inputaction.h
index b027ff0e2..694647a93 100644
--- a/src/input/inputaction.h
+++ b/src/input/inputaction.h
@@ -533,6 +533,7 @@ namespace InputAction
CHAT_LANG_TAB,
CHAT_GM_TAB,
CHAT_PARTY_TAB,
+ CHAT_GUILD_TAB,
TOTAL
};
} // namespace InputAction
diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h
index a46fb72e4..2235daba4 100644
--- a/src/input/inputactionmap.h
+++ b/src/input/inputactionmap.h
@@ -3959,6 +3959,11 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
InputCondition::INGAME,
"partytab|partychattab",
false},
+ {"keyGuildTab",
+ defaultAction(&Actions::chatGuildTab),
+ InputCondition::INGAME,
+ "guildtab|guildchattab",
+ false},
};
#undef defaultAction