summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-02-16 23:48:24 +0300
committerAndrei Karas <akaras@inbox.ru>2015-02-16 23:48:24 +0300
commit2cdd26078b672c19ba4f440df20a59082b00a1f6 (patch)
treedc3c53303e299f04ead3e473f9c71be229faa902
parent0561612345f979a3c59ed4feeeddf6491974905a (diff)
downloadmv-2cdd26078b672c19ba4f440df20a59082b00a1f6.tar.gz
mv-2cdd26078b672c19ba4f440df20a59082b00a1f6.tar.bz2
mv-2cdd26078b672c19ba4f440df20a59082b00a1f6.tar.xz
mv-2cdd26078b672c19ba4f440df20a59082b00a1f6.zip
Move talkPet from ea namespace into eathena and tmwa.
-rw-r--r--src/net/ea/chathandler.cpp8
-rw-r--r--src/net/ea/chathandler.h3
-rw-r--r--src/net/eathena/chathandler.cpp8
-rw-r--r--src/net/eathena/chathandler.h3
-rw-r--r--src/net/tmwa/chathandler.cpp8
-rw-r--r--src/net/tmwa/chathandler.h3
6 files changed, 22 insertions, 11 deletions
diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp
index 50df82ff3..30bef2118 100644
--- a/src/net/ea/chathandler.cpp
+++ b/src/net/ea/chathandler.cpp
@@ -79,14 +79,6 @@ void ChatHandler::me(const std::string &restrict text,
talk(action, channel);
}
-void ChatHandler::talkPet(const std::string &restrict text,
- const std::string &restrict channel) const
-{
- // here need string duplication
- std::string action = strprintf("\302\202\303 %s", text.c_str());
- talk(action, channel);
-}
-
std::string ChatHandler::getPopLastWhisperNick()
{
std::string nick;
diff --git a/src/net/ea/chathandler.h b/src/net/ea/chathandler.h
index 5792bedac..fd2a67fa7 100644
--- a/src/net/ea/chathandler.h
+++ b/src/net/ea/chathandler.h
@@ -44,9 +44,6 @@ class ChatHandler notfinal : public Net::ChatHandler
A_DELETE_COPY(ChatHandler)
- void talkPet(const std::string &restrict text,
- const std::string &restrict channel) const override final;
-
void me(const std::string &restrict text,
const std::string &restrict channel) const override final;
diff --git a/src/net/eathena/chathandler.cpp b/src/net/eathena/chathandler.cpp
index 41fc78f3b..d83daac27 100644
--- a/src/net/eathena/chathandler.cpp
+++ b/src/net/eathena/chathandler.cpp
@@ -745,4 +745,12 @@ void ChatHandler::processBeingChat(Net::MessageIn &msg)
BLOCK_END("ChatHandler::processBeingChat")
}
+void ChatHandler::talkPet(const std::string &restrict text,
+ const std::string &restrict channel) const
+{
+ // here need string duplication
+ std::string action = strprintf("\302\202\303 %s", text.c_str());
+ talk(action, channel);
+}
+
} // namespace EAthena
diff --git a/src/net/eathena/chathandler.h b/src/net/eathena/chathandler.h
index 095a545d6..3bda55400 100644
--- a/src/net/eathena/chathandler.h
+++ b/src/net/eathena/chathandler.h
@@ -84,6 +84,9 @@ class ChatHandler final : public MessageHandler, public Ea::ChatHandler
void partChannel(const std::string &channel) override final;
+ void talkPet(const std::string &restrict text,
+ const std::string &restrict channel) const override final;
+
protected:
static std::string extractChannelFromMessage(std::string &chatMsg);
diff --git a/src/net/tmwa/chathandler.cpp b/src/net/tmwa/chathandler.cpp
index 9413bf4ea..e4066e91f 100644
--- a/src/net/tmwa/chathandler.cpp
+++ b/src/net/tmwa/chathandler.cpp
@@ -680,4 +680,12 @@ void ChatHandler::processBeingChat(Net::MessageIn &msg)
BLOCK_END("ChatHandler::processBeingChat")
}
+void ChatHandler::talkPet(const std::string &restrict text,
+ const std::string &restrict channel) const
+{
+ // here need string duplication
+ std::string action = strprintf("\302\202\303 %s", text.c_str());
+ talk(action, channel);
+}
+
} // namespace TmwAthena
diff --git a/src/net/tmwa/chathandler.h b/src/net/tmwa/chathandler.h
index 167190115..811dbda9f 100644
--- a/src/net/tmwa/chathandler.h
+++ b/src/net/tmwa/chathandler.h
@@ -82,6 +82,9 @@ class ChatHandler final : public MessageHandler, public Ea::ChatHandler
void partChannel(const std::string &channel) override final;
+ void talkPet(const std::string &restrict text,
+ const std::string &restrict channel) const override final;
+
protected:
static void processChat(Net::MessageIn &msg);