Replace most of Net::NpcHandler with events

Reviewed-by: Chuck Miller

1 files changed, 5 insertions, 16 deletions

diff --git a/src/net/tmwa/npchandler.h b/src/net/tmwa/npchandler.h
index 515f62df..93c9f6ec 100644
--- a/src/net/tmwa/npchandler.h
+++ b/src/net/tmwa/npchandler.h
@@ -22,7 +22,8 @@
 #ifndef NET_TA_NPCHANDLER_H
 #define NET_TA_NPCHANDLER_H
 
-#include "net/net.h"
+#include "listener.h"
+
 #include "net/npchandler.h"
 
 #include "net/tmwa/messagehandler.h"
@@ -31,27 +32,15 @@
 
 namespace TmwAthena {
 
-class NpcHandler : public MessageHandler, public Net::NpcHandler
+class NpcHandler : public MessageHandler, public Net::NpcHandler,
+        public Mana::Listener
 {
     public:
         NpcHandler();
 
         void handleMessage(Net::MessageIn &msg);
 
-        void talk(int npcId);
-
-        void nextDialog(int npcId);
-
-        void closeDialog(int npcId);
-
-        void listInput(int npcId, int value);
-
-        void integerInput(int npcId, int value);
-
-        void stringInput(int npcId, const std::string &value);
-
-        void sendLetter(int npcId, const std::string &recipient,
-                        const std::string &text);
+        void event(const std::string &channel, const Mana::Event &event);
 
         void startShopping(int beingId);