summaryrefslogtreecommitdiff
path: root/src/net/ea/chathandler.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-09-09 22:10:53 +0300
committerAndrei Karas <akaras@inbox.ru>2011-09-09 22:11:30 +0300
commit703a3c4df3732e3e88559147001260f3355d42d6 (patch)
treefcaf8919cf734429374e4bb9a83b2b4a33835d1d /src/net/ea/chathandler.cpp
parent3a875a0026936d4bcb3bd1c2b6e8ac547cd5e27e (diff)
downloadmv-703a3c4df3732e3e88559147001260f3355d42d6.tar.gz
mv-703a3c4df3732e3e88559147001260f3355d42d6.tar.bz2
mv-703a3c4df3732e3e88559147001260f3355d42d6.tar.xz
mv-703a3c4df3732e3e88559147001260f3355d42d6.zip
Continue fix for shadow variables/methods errors.
Diffstat (limited to 'src/net/ea/chathandler.cpp')
-rw-r--r--src/net/ea/chathandler.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp
index 5737cc2b2..c18b1bb9a 100644
--- a/src/net/ea/chathandler.cpp
+++ b/src/net/ea/chathandler.cpp
@@ -125,7 +125,7 @@ void ChatHandler::processWhisperResponse(Net::MessageIn &msg)
case 0x01:
if (chatWindow)
{
- chatWindow->whisper(nick,
+ chatWindow->addWhisper(nick,
strprintf(_("Whisper could not be "
"sent, %s is offline."), nick.c_str()), BY_SERVER);
}
@@ -133,7 +133,7 @@ void ChatHandler::processWhisperResponse(Net::MessageIn &msg)
case 0x02:
if (chatWindow)
{
- chatWindow->whisper(nick,
+ chatWindow->addWhisper(nick,
strprintf(_("Whisper could not "
"be sent, ignored by %s."), nick.c_str()),
BY_SERVER);
@@ -183,7 +183,7 @@ void ChatHandler::processWhisper(Net::MessageIn &msg)
if (tradeBot)
{
if (showMsg && chatWindow)
- chatWindow->whisper(nick, chatMsg);
+ chatWindow->addWhisper(nick, chatMsg);
shopWindow->giveList(nick,
ShopWindow::SELL);
}
@@ -193,7 +193,7 @@ void ChatHandler::processWhisper(Net::MessageIn &msg)
if (tradeBot)
{
if (showMsg && chatWindow)
- chatWindow->whisper(nick, chatMsg);
+ chatWindow->addWhisper(nick, chatMsg);
shopWindow->giveList(nick,
ShopWindow::BUY);
}
@@ -201,7 +201,7 @@ void ChatHandler::processWhisper(Net::MessageIn &msg)
else if (chatMsg.find("!buyitem ") == 0)
{
if (showMsg && chatWindow)
- chatWindow->whisper(nick, chatMsg);
+ chatWindow->addWhisper(nick, chatMsg);
if (tradeBot)
{
shopWindow->processRequest(nick, chatMsg,
@@ -211,7 +211,7 @@ void ChatHandler::processWhisper(Net::MessageIn &msg)
else if (chatMsg.find("!sellitem ") == 0)
{
if (showMsg && chatWindow)
- chatWindow->whisper(nick, chatMsg);
+ chatWindow->addWhisper(nick, chatMsg);
if (tradeBot)
{
shopWindow->processRequest(nick, chatMsg,
@@ -223,7 +223,7 @@ void ChatHandler::processWhisper(Net::MessageIn &msg)
{
chatMsg = chatMsg.erase(0, 2);
if (showMsg && chatWindow)
- chatWindow->whisper(nick, chatMsg);
+ chatWindow->addWhisper(nick, chatMsg);
if (chatMsg.find("B1") == 0
|| chatMsg.find("S1") == 0)
{
@@ -232,12 +232,12 @@ void ChatHandler::processWhisper(Net::MessageIn &msg)
}
else if (chatWindow)
{
- chatWindow->whisper(nick, chatMsg);
+ chatWindow->addWhisper(nick, chatMsg);
}
}
else if (chatWindow)
{
- chatWindow->whisper(nick, chatMsg);
+ chatWindow->addWhisper(nick, chatMsg);
}
}
else
@@ -246,7 +246,7 @@ void ChatHandler::processWhisper(Net::MessageIn &msg)
|| (chatMsg.find("!selllist")
!= 0 && chatMsg.find("!buylist") != 0)))
{
- chatWindow->whisper(nick, chatMsg);
+ chatWindow->addWhisper(nick, chatMsg);
}
}
}