Extract shared logic from npchandler and playerhandler netcode to ea namespace.

1 files changed, 4 insertions, 17 deletions

diff --git a/src/net/tmwa/npchandler.h b/src/net/tmwa/npchandler.h
index 1b4455854..624f64cbc 100644
--- a/src/net/tmwa/npchandler.h
+++ b/src/net/tmwa/npchandler.h
@@ -26,6 +26,8 @@
 #include "net/net.h"
 #include "net/npchandler.h"
 
+#include "net/ea/npchandler.h"
+
 #include "net/tmwa/messagehandler.h"
 
 #include <map>
@@ -41,7 +43,7 @@ class NpcDialog;
 namespace TmwAthena
 {
 
-class NpcHandler : public MessageHandler, public Net::NpcHandler
+class NpcHandler : public MessageHandler, public Ea::NpcHandler
 {
     public:
         NpcHandler();
@@ -60,11 +62,6 @@ class NpcHandler : public MessageHandler, public Net::NpcHandler
 
         void stringInput(int npcId, const std::string &value);
 
-        void sendLetter(int npcId, const std::string &recipient,
-                        const std::string &text);
-
-        void startShopping(int beingId);
-
         void buy(int beingId);
 
         void sell(int beingId);
@@ -73,17 +70,7 @@ class NpcHandler : public MessageHandler, public Net::NpcHandler
 
         void sellItem(int beingId, int itemId, int amount);
 
-        void endShopping(int beingId);
-
-        void clearDialogs();
-
-    private:
-        typedef struct
-        {
-            NpcDialog* dialog;
-        } Wrapper;
-        typedef std::map<int, Wrapper> NpcDialogs;
-        NpcDialogs mNpcDialogs;
+        int getNpc(Net::MessageIn &msg, bool haveLength);
 };
 
 } // namespace TmwAthena