summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-09-07 15:40:45 +0300
committerAndrei Karas <akaras@inbox.ru>2014-09-07 15:42:57 +0300
commit201d66ca502db6602911ce69288d2adb975bba2d (patch)
tree8acab2d3a1c73734f16c2024356d810b01bdfa4a /src
parentee5643e7412f366241568fb206a75715f9902aa3 (diff)
downloadplus-201d66ca502db6602911ce69288d2adb975bba2d.tar.gz
plus-201d66ca502db6602911ce69288d2adb975bba2d.tar.bz2
plus-201d66ca502db6602911ce69288d2adb975bba2d.tar.xz
plus-201d66ca502db6602911ce69288d2adb975bba2d.zip
Move processWhisper from ea namespace into eathena and tmwa.
Diffstat (limited to 'src')
-rw-r--r--src/net/ea/chathandler.cpp15
-rw-r--r--src/net/ea/chathandler.h2
-rw-r--r--src/net/eathena/chathandler.cpp15
-rw-r--r--src/net/eathena/chathandler.h2
-rw-r--r--src/net/tmwa/chathandler.cpp15
-rw-r--r--src/net/tmwa/chathandler.h2
6 files changed, 34 insertions, 17 deletions
diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp
index bd0adf77e..52e9a7873 100644
--- a/src/net/ea/chathandler.cpp
+++ b/src/net/ea/chathandler.cpp
@@ -135,21 +135,6 @@ void ChatHandler::processWhisperResponse(Net::MessageIn &msg)
BLOCK_END("ChatHandler::processWhisperResponse")
}
-void ChatHandler::processWhisper(Net::MessageIn &msg) const
-{
- BLOCK_START("ChatHandler::processWhisper")
- const int chatMsgLength = msg.readInt16("len") - 28;
- std::string nick = msg.readString(24, "message");
-
- if (chatMsgLength <= 0)
- {
- BLOCK_END("ChatHandler::processWhisper")
- return;
- }
-
- processWhisperContinue(nick, msg.readString(chatMsgLength, "message"));
-}
-
void ChatHandler::processWhisperContinue(const std::string &nick,
std::string chatMsg) const
{
diff --git a/src/net/ea/chathandler.h b/src/net/ea/chathandler.h
index c541e0860..338d49b44 100644
--- a/src/net/ea/chathandler.h
+++ b/src/net/ea/chathandler.h
@@ -50,8 +50,6 @@ class ChatHandler notfinal : public Net::ChatHandler
virtual void processWhisperResponse(Net::MessageIn &msg);
- virtual void processWhisper(Net::MessageIn &msg) const;
-
virtual void processBeingChat(Net::MessageIn &msg) const;
virtual void processMVP(Net::MessageIn &msg) const;
diff --git a/src/net/eathena/chathandler.cpp b/src/net/eathena/chathandler.cpp
index 1a5006166..f10f8fcfb 100644
--- a/src/net/eathena/chathandler.cpp
+++ b/src/net/eathena/chathandler.cpp
@@ -312,4 +312,19 @@ void ChatHandler::processChat(Net::MessageIn &msg)
BLOCK_END("ChatHandler::processChat")
}
+void ChatHandler::processWhisper(Net::MessageIn &msg) const
+{
+ BLOCK_START("ChatHandler::processWhisper")
+ const int chatMsgLength = msg.readInt16("len") - 28;
+ std::string nick = msg.readString(24, "nick");
+
+ if (chatMsgLength <= 0)
+ {
+ BLOCK_END("ChatHandler::processWhisper")
+ return;
+ }
+
+ processWhisperContinue(nick, msg.readString(chatMsgLength, "message"));
+}
+
} // namespace EAthena
diff --git a/src/net/eathena/chathandler.h b/src/net/eathena/chathandler.h
index 397f947ff..309216a5f 100644
--- a/src/net/eathena/chathandler.h
+++ b/src/net/eathena/chathandler.h
@@ -61,6 +61,8 @@ class ChatHandler final : public MessageHandler, public Ea::ChatHandler
protected:
void processChat(Net::MessageIn &msg);
+
+ void processWhisper(Net::MessageIn &msg) const;
};
} // namespace EAthena
diff --git a/src/net/tmwa/chathandler.cpp b/src/net/tmwa/chathandler.cpp
index dbe3c09a8..15f65fe90 100644
--- a/src/net/tmwa/chathandler.cpp
+++ b/src/net/tmwa/chathandler.cpp
@@ -365,4 +365,19 @@ void ChatHandler::processChat(Net::MessageIn &msg)
BLOCK_END("ChatHandler::processChat")
}
+void ChatHandler::processWhisper(Net::MessageIn &msg) const
+{
+ BLOCK_START("ChatHandler::processWhisper")
+ const int chatMsgLength = msg.readInt16("len") - 28;
+ std::string nick = msg.readString(24, "nick");
+
+ if (chatMsgLength <= 0)
+ {
+ BLOCK_END("ChatHandler::processWhisper")
+ return;
+ }
+
+ processWhisperContinue(nick, msg.readString(chatMsgLength, "message"));
+}
+
} // namespace TmwAthena
diff --git a/src/net/tmwa/chathandler.h b/src/net/tmwa/chathandler.h
index a9f5ce352..e548fbff9 100644
--- a/src/net/tmwa/chathandler.h
+++ b/src/net/tmwa/chathandler.h
@@ -61,6 +61,8 @@ class ChatHandler final : public MessageHandler, public Ea::ChatHandler
protected:
void processChat(Net::MessageIn &msg);
+
+ void processWhisper(Net::MessageIn &msg) const;
};
} // namespace TmwAthena