summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-09-07 17:14:27 +0300
committerAndrei Karas <akaras@inbox.ru>2014-09-07 17:14:27 +0300
commitd18a2a0ed390162b771fea7d4c101f37f6be247a (patch)
treefe06befd74ab94ccaf68d04cf0fa5083134fe338
parent51ac76e8effd03b968a142b7bd900584d5942a59 (diff)
downloadmanaplus-d18a2a0ed390162b771fea7d4c101f37f6be247a.tar.gz
manaplus-d18a2a0ed390162b771fea7d4c101f37f6be247a.tar.bz2
manaplus-d18a2a0ed390162b771fea7d4c101f37f6be247a.tar.xz
manaplus-d18a2a0ed390162b771fea7d4c101f37f6be247a.zip
Move processWhisperResponse from ea namespace into eathena and tmwa.
-rw-r--r--src/net/ea/chathandler.cpp8
-rw-r--r--src/net/ea/chathandler.h2
-rw-r--r--src/net/eathena/chathandler.cpp8
-rw-r--r--src/net/eathena/chathandler.h2
-rw-r--r--src/net/tmwa/chathandler.cpp8
-rw-r--r--src/net/tmwa/chathandler.h2
6 files changed, 20 insertions, 10 deletions
diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp
index 6e6b9927e..b10123706 100644
--- a/src/net/ea/chathandler.cpp
+++ b/src/net/ea/chathandler.cpp
@@ -83,14 +83,6 @@ void ChatHandler::talkPet(const std::string &restrict text,
talk(action, channel);
}
-void ChatHandler::processWhisperResponse(Net::MessageIn &msg)
-{
- BLOCK_START("ChatHandler::processWhisperResponse")
-
- const uint8_t type = msg.readUInt8("response");
- processWhisperResponseContinue(type);
-}
-
void ChatHandler::processWhisperResponseContinue(const uint8_t type)
{
std::string nick;
diff --git a/src/net/ea/chathandler.h b/src/net/ea/chathandler.h
index e33b2433a..810ca7efa 100644
--- a/src/net/ea/chathandler.h
+++ b/src/net/ea/chathandler.h
@@ -48,8 +48,6 @@ class ChatHandler notfinal : public Net::ChatHandler
void me(const std::string &restrict text,
const std::string &restrict channel) const override final;
- virtual void processWhisperResponse(Net::MessageIn &msg);
-
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 69e6eae9a..5e1a0679e 100644
--- a/src/net/eathena/chathandler.cpp
+++ b/src/net/eathena/chathandler.cpp
@@ -329,4 +329,12 @@ void ChatHandler::processWhisper(Net::MessageIn &msg) const
processWhisperContinue(nick, msg.readString(chatMsgLength, "message"));
}
+void ChatHandler::processWhisperResponse(Net::MessageIn &msg)
+{
+ BLOCK_START("ChatHandler::processWhisperResponse")
+
+ const uint8_t type = msg.readUInt8("response");
+ processWhisperResponseContinue(type);
+}
+
} // namespace EAthena
diff --git a/src/net/eathena/chathandler.h b/src/net/eathena/chathandler.h
index 309216a5f..35a3c186c 100644
--- a/src/net/eathena/chathandler.h
+++ b/src/net/eathena/chathandler.h
@@ -63,6 +63,8 @@ class ChatHandler final : public MessageHandler, public Ea::ChatHandler
void processChat(Net::MessageIn &msg);
void processWhisper(Net::MessageIn &msg) const;
+
+ void processWhisperResponse(Net::MessageIn &msg);
};
} // namespace EAthena
diff --git a/src/net/tmwa/chathandler.cpp b/src/net/tmwa/chathandler.cpp
index 15f65fe90..3eada4215 100644
--- a/src/net/tmwa/chathandler.cpp
+++ b/src/net/tmwa/chathandler.cpp
@@ -380,4 +380,12 @@ void ChatHandler::processWhisper(Net::MessageIn &msg) const
processWhisperContinue(nick, msg.readString(chatMsgLength, "message"));
}
+void ChatHandler::processWhisperResponse(Net::MessageIn &msg)
+{
+ BLOCK_START("ChatHandler::processWhisperResponse")
+
+ const uint8_t type = msg.readUInt8("response");
+ processWhisperResponseContinue(type);
+}
+
} // namespace TmwAthena
diff --git a/src/net/tmwa/chathandler.h b/src/net/tmwa/chathandler.h
index e548fbff9..a72dfb78a 100644
--- a/src/net/tmwa/chathandler.h
+++ b/src/net/tmwa/chathandler.h
@@ -63,6 +63,8 @@ class ChatHandler final : public MessageHandler, public Ea::ChatHandler
void processChat(Net::MessageIn &msg);
void processWhisper(Net::MessageIn &msg) const;
+
+ void processWhisperResponse(Net::MessageIn &msg);
};
} // namespace TmwAthena