summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-12-22 04:36:26 +0300
committerAndrei Karas <akaras@inbox.ru>2017-12-22 04:36:26 +0300
commit3b22410e42be27ac30fc63f020243241d1eea737 (patch)
treef574a40a44bb8a33ff3226c784debd8fcda02330 /src/net
parent98ed087de210f5a5a0979b0d60b6d4b21b24ba4c (diff)
downloadmv-3b22410e42be27ac30fc63f020243241d1eea737.tar.gz
mv-3b22410e42be27ac30fc63f020243241d1eea737.tar.bz2
mv-3b22410e42be27ac30fc63f020243241d1eea737.tar.xz
mv-3b22410e42be27ac30fc63f020243241d1eea737.zip
Remove default parameters from chatwindow.h
Diffstat (limited to 'src/net')
-rw-r--r--src/net/ea/chatrecv.cpp4
-rw-r--r--src/net/eathena/chatrecv.cpp6
-rw-r--r--src/net/tmwa/chatrecv.cpp50
3 files changed, 45 insertions, 15 deletions
diff --git a/src/net/ea/chatrecv.cpp b/src/net/ea/chatrecv.cpp
index 87db3fa98..5b3ec562a 100644
--- a/src/net/ea/chatrecv.cpp
+++ b/src/net/ea/chatrecv.cpp
@@ -92,8 +92,8 @@ void ChatRecv::processWhisperResponseContinue(Net::MessageIn &msg,
chatWindow->addWhisper(nick,
// TRANSLATORS: chat message
strprintf(_("Whisper could not be sent, %s is offline."),
- nick.c_str()),
- ChatMsgType::BY_SERVER);
+ nick.c_str()),
+ ChatMsgType::BY_SERVER);
}
break;
case 0x02:
diff --git a/src/net/eathena/chatrecv.cpp b/src/net/eathena/chatrecv.cpp
index 60033bf55..6d125aad6 100644
--- a/src/net/eathena/chatrecv.cpp
+++ b/src/net/eathena/chatrecv.cpp
@@ -494,7 +494,11 @@ void ChatRecv::processWhisperContinue(const std::string &nick,
if (nick != "Server")
{
if (playerRelations.hasPermission(nick, PlayerRelation::WHISPER))
- chatWindow->addWhisper(nick, chatMsg);
+ {
+ chatWindow->addWhisper(nick,
+ chatMsg,
+ ChatMsgType::BY_OTHER);
+ }
}
else if (localChatTab != nullptr)
{
diff --git a/src/net/tmwa/chatrecv.cpp b/src/net/tmwa/chatrecv.cpp
index 42cac06f4..480527a82 100644
--- a/src/net/tmwa/chatrecv.cpp
+++ b/src/net/tmwa/chatrecv.cpp
@@ -195,7 +195,11 @@ void ChatRecv::processWhisperContinue(const std::string &nick,
if (tradeBot)
{
if (showMsg && (chatWindow != nullptr))
- chatWindow->addWhisper(nick, chatMsg);
+ {
+ chatWindow->addWhisper(nick,
+ chatMsg,
+ ChatMsgType::BY_OTHER);
+ }
shopWindow->giveList(nick, ShopWindow::SELL);
}
}
@@ -203,15 +207,23 @@ void ChatRecv::processWhisperContinue(const std::string &nick,
{
if (tradeBot)
{
- if (showMsg && (chatWindow != nullptr))
- chatWindow->addWhisper(nick, chatMsg);
+ if (showMsg && chatWindow != nullptr)
+ {
+ chatWindow->addWhisper(nick,
+ chatMsg,
+ ChatMsgType::BY_OTHER);
+ }
shopWindow->giveList(nick, ShopWindow::BUY);
}
}
else if (chatMsg.find("!buyitem ") == 0)
{
- if (showMsg && (chatWindow != nullptr))
- chatWindow->addWhisper(nick, chatMsg);
+ if (showMsg && chatWindow != nullptr)
+ {
+ chatWindow->addWhisper(nick,
+ chatMsg,
+ ChatMsgType::BY_OTHER);
+ }
if (tradeBot)
{
shopWindow->processRequest(nick, chatMsg,
@@ -220,8 +232,12 @@ void ChatRecv::processWhisperContinue(const std::string &nick,
}
else if (chatMsg.find("!sellitem ") == 0)
{
- if (showMsg && (chatWindow != nullptr))
- chatWindow->addWhisper(nick, chatMsg);
+ if (showMsg && chatWindow != nullptr)
+ {
+ chatWindow->addWhisper(nick,
+ chatMsg,
+ ChatMsgType::BY_OTHER);
+ }
if (tradeBot)
{
shopWindow->processRequest(nick, chatMsg,
@@ -232,19 +248,27 @@ void ChatRecv::processWhisperContinue(const std::string &nick,
&& chatMsg.find("\302\202") == 0)
{
chatMsg = chatMsg.erase(0, 2);
- if (showMsg && (chatWindow != nullptr))
- chatWindow->addWhisper(nick, chatMsg);
+ if (showMsg && chatWindow != nullptr)
+ {
+ chatWindow->addWhisper(nick,
+ chatMsg,
+ ChatMsgType::BY_OTHER);
+ }
if (chatMsg.find("B1") == 0 || chatMsg.find("S1") == 0)
ShopWindow::showList(nick, chatMsg);
}
else if (chatWindow != nullptr)
{
- chatWindow->addWhisper(nick, chatMsg);
+ chatWindow->addWhisper(nick,
+ chatMsg,
+ ChatMsgType::BY_OTHER);
}
}
else if (chatWindow != nullptr)
{
- chatWindow->addWhisper(nick, chatMsg);
+ chatWindow->addWhisper(nick,
+ chatMsg,
+ ChatMsgType::BY_OTHER);
}
}
else
@@ -254,7 +278,9 @@ void ChatRecv::processWhisperContinue(const std::string &nick,
(chatMsg.find("!selllist") != 0 &&
chatMsg.find("!buylist") != 0)))
{
- chatWindow->addWhisper(nick, chatMsg);
+ chatWindow->addWhisper(nick,
+ chatMsg,
+ ChatMsgType::BY_OTHER);
}
}
}