eathena: add packet CMSG_HOMMERC_EMOTE 0x0b14.

11 files changed, 33 insertions, 0 deletions

diff --git a/src/net/eathena/homunculushandler.cpp b/src/net/eathena/homunculushandler.cpp
index 7eafac3cc..42426b57f 100644
--- a/src/net/eathena/homunculushandler.cpp
+++ b/src/net/eathena/homunculushandler.cpp
@@ -300,4 +300,10 @@ void HomunculusHandler::talk(const std::string &restrict text) const
     outMsg.writeInt8(0, "zero byte");
 }
 
+void HomunculusHandler::emote(const uint8_t emoteId) const
+{
+    createOutPacket(CMSG_HOMMERC_EMOTE);
+    outMsg.writeInt8(emoteId, "emote id");
+}
+
 }  // namespace EAthena
diff --git a/src/net/eathena/homunculushandler.h b/src/net/eathena/homunculushandler.h
index c8f42f6b6..f3c7a48aa 100644
--- a/src/net/eathena/homunculushandler.h
+++ b/src/net/eathena/homunculushandler.h
@@ -51,6 +51,8 @@ class HomunculusHandler final : public MessageHandler,
 
         void talk(const std::string &restrict text) const override final;
 
+        void emote(const uint8_t emoteId) const override final;
+
     protected:
         static void processHomunculusSkills(Net::MessageIn &msg);
 
diff --git a/src/net/eathena/mercenaryhandler.cpp b/src/net/eathena/mercenaryhandler.cpp
index 27c1e361c..857890bd7 100644
--- a/src/net/eathena/mercenaryhandler.cpp
+++ b/src/net/eathena/mercenaryhandler.cpp
@@ -230,4 +230,10 @@ void MercenaryHandler::talk(const std::string &restrict text) const
     outMsg.writeInt8(0, "zero byte");
 }
 
+void MercenaryHandler::emote(const uint8_t emoteId) const
+{
+    createOutPacket(CMSG_HOMMERC_EMOTE);
+    outMsg.writeInt8(emoteId, "emote id");
+}
+
 }  // namespace EAthena
diff --git a/src/net/eathena/mercenaryhandler.h b/src/net/eathena/mercenaryhandler.h
index b4e1cd48d..c2a1b18f1 100644
--- a/src/net/eathena/mercenaryhandler.h
+++ b/src/net/eathena/mercenaryhandler.h
@@ -49,6 +49,8 @@ class MercenaryHandler final : public MessageHandler,
 
         void talk(const std::string &restrict text) const override final;
 
+        void emote(const uint8_t emoteId) const override final;
+
     protected:
         static void processMercenaryUpdate(Net::MessageIn &msg);
 
diff --git a/src/net/eathena/protocol.h b/src/net/eathena/protocol.h
index b46b8ef12..d42ec59fb 100644
--- a/src/net/eathena/protocol.h
+++ b/src/net/eathena/protocol.h
@@ -525,6 +525,7 @@
 #define CMSG_HOMMERC_MOVE_TO         0x0232
 #define CMSG_HOMMERC_ATTACK          0x0233
 #define CMSG_HOMMERC_TALK            0x0b13
+#define CMSG_HOMMERC_EMOTE           0x0b14
 
 #define CMSG_DORI_DORI               0x01e7
 #define CMSG_EXPLOSION_SPIRITS       0x01ed
diff --git a/src/net/homunculushandler.h b/src/net/homunculushandler.h
index aed2aef28..41a82fc42 100644
--- a/src/net/homunculushandler.h
+++ b/src/net/homunculushandler.h
@@ -47,6 +47,8 @@ class HomunculusHandler notfinal
         virtual void fire() const = 0;
 
         virtual void talk(const std::string &restrict text) const = 0;
+
+        virtual void emote(const uint8_t emoteId) const = 0;
 };
 
 }  // namespace Net
diff --git a/src/net/mercenaryhandler.h b/src/net/mercenaryhandler.h
index 0e9c5106c..1330544ba 100644
--- a/src/net/mercenaryhandler.h
+++ b/src/net/mercenaryhandler.h
@@ -45,6 +45,8 @@ class MercenaryHandler notfinal
         virtual void attack(const int targetId, const bool keep) const = 0;
 
         virtual void talk(const std::string &restrict text) const = 0;
+
+        virtual void emote(const uint8_t emoteId) const = 0;
 };
 
 }  // namespace Net
diff --git a/src/net/tmwa/homunculushandler.cpp b/src/net/tmwa/homunculushandler.cpp
index d582371ce..419816f68 100644
--- a/src/net/tmwa/homunculushandler.cpp
+++ b/src/net/tmwa/homunculushandler.cpp
@@ -71,4 +71,8 @@ void HomunculusHandler::talk(const std::string &restrict text A_UNUSED) const
 {
 }
 
+void HomunculusHandler::emote(const uint8_t emoteId A_UNUSED) const
+{
+}
+
 }  // namespace TmwAthena
diff --git a/src/net/tmwa/homunculushandler.h b/src/net/tmwa/homunculushandler.h
index bd6a4b8ce..52e484cc6 100644
--- a/src/net/tmwa/homunculushandler.h
+++ b/src/net/tmwa/homunculushandler.h
@@ -51,6 +51,8 @@ class HomunculusHandler final : public MessageHandler,
         void fire() const override final;
 
         void talk(const std::string &restrict text) const override final;
+
+        void emote(const uint8_t emoteId) const override final;
 };
 
 }  // namespace TmwAthena
diff --git a/src/net/tmwa/mercenaryhandler.cpp b/src/net/tmwa/mercenaryhandler.cpp
index 29f568bcb..9df31bc14 100644
--- a/src/net/tmwa/mercenaryhandler.cpp
+++ b/src/net/tmwa/mercenaryhandler.cpp
@@ -67,4 +67,8 @@ void MercenaryHandler::talk(const std::string &restrict text A_UNUSED) const
 {
 }
 
+void MercenaryHandler::emote(const uint8_t emoteId A_UNUSED) const
+{
+}
+
 }  // namespace TmwAthena
diff --git a/src/net/tmwa/mercenaryhandler.h b/src/net/tmwa/mercenaryhandler.h
index 43afaa969..24a926889 100644
--- a/src/net/tmwa/mercenaryhandler.h
+++ b/src/net/tmwa/mercenaryhandler.h
@@ -49,6 +49,8 @@ class MercenaryHandler final : public MessageHandler,
         void attack(const int targetId, const bool keep) const override final;
 
         void talk(const std::string &restrict text) const override final;
+
+        void emote(const uint8_t emoteId) const override final;
 };
 
 }  // namespace TmwAthena