1 files changed, 15 insertions, 24 deletions
diff --git a/src/net/tmwa/npchandler.h b/src/net/tmwa/npchandler.h
index bd696bdd..1e933418 100644
--- a/src/net/tmwa/npchandler.h
+++ b/src/net/tmwa/npchandler.h
@@ -22,15 +22,14 @@
 #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"
 
 #include <map>
 
-class NpcDialog;
-
 namespace TmwAthena {
 
 class NpcHandler : public MessageHandler, public Net::NpcHandler
@@ -40,13 +39,25 @@ class NpcHandler : public MessageHandler, public Net::NpcHandler
 
         void handleMessage(Net::MessageIn &msg);
 
+        void startShopping(int beingId);
+
+        void buy(int beingId);
+
+        void sell(int beingId);
+
+        void buyItem(int beingId, int itemId, int amount);
+
+        void sellItem(int beingId, int itemId, int amount);
+
+        void endShopping(int beingId);
+
         void talk(int npcId);
 
         void nextDialog(int npcId);
 
         void closeDialog(int npcId);
 
-        void listInput(int npcId, int value);
+        void menuSelect(int npcId, int choice);
 
         void integerInput(int npcId, int value);
 
@@ -55,26 +66,6 @@ class NpcHandler : public MessageHandler, public Net::NpcHandler
         void sendLetter(int npcId, const std::string &recipient,
                         const std::string &text);
 
-        void startShopping(int beingId);
-
-        void buy(int beingId);
-
-        void sell(int beingId);
-
-        void buyItem(int beingId, int itemId, int amount);
-
-        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;
 };
 
 } // namespace TmwAthena