summaryrefslogtreecommitdiff
path: root/src/actions
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-06-09 20:30:47 +0300
committerAndrei Karas <akaras@inbox.ru>2017-06-09 20:30:47 +0300
commit407de0a8d0898b28a587962e997df816cb17b6a9 (patch)
tree99a0184bb44950a900a9f093afb8887bdd148548 /src/actions
parent972fdcbd1ed61e2528c8b4c733f21a70d7f674b1 (diff)
downloadmv-407de0a8d0898b28a587962e997df816cb17b6a9.tar.gz
mv-407de0a8d0898b28a587962e997df816cb17b6a9.tar.bz2
mv-407de0a8d0898b28a587962e997df816cb17b6a9.tar.xz
mv-407de0a8d0898b28a587962e997df816cb17b6a9.zip
Fix code style.
Diffstat (limited to 'src/actions')
-rw-r--r--src/actions/chat.cpp5
-rw-r--r--src/actions/commands.cpp7
2 files changed, 7 insertions, 5 deletions
diff --git a/src/actions/chat.cpp b/src/actions/chat.cpp
index 40ff966be..e1f801c0b 100644
--- a/src/actions/chat.cpp
+++ b/src/actions/chat.cpp
@@ -300,8 +300,11 @@ impHandler(msg2)
std::string recvnick;
std::string message;
- if ((chatHandler != nullptr) && splitWhisper(event.args, recvnick, message))
+ if (chatHandler != nullptr &&
+ splitWhisper(event.args, recvnick, message))
+ {
chatHandler->privateMessage(recvnick, message);
+ }
return true;
}
diff --git a/src/actions/commands.cpp b/src/actions/commands.cpp
index bad59ec29..f22d7bc93 100644
--- a/src/actions/commands.cpp
+++ b/src/actions/commands.cpp
@@ -577,15 +577,14 @@ impHandler(sendMail)
impHandler(info)
{
- if ((event.tab == nullptr) ||
- (localPlayer == nullptr) ||
+ if (event.tab == nullptr ||
+ localPlayer == nullptr ||
Net::getNetworkType() == ServerType::TMWATHENA)
{
return false;
}
- if ((event.tab != nullptr) &&
- (guildHandler != nullptr) &&
+ if (guildHandler != nullptr &&
event.tab->getType() == ChatTabType::GUILD)
{
const Guild *const guild = localPlayer->getGuild();