From 2293b1c5ef0bb7378140bf73f1fef03a4504bdd2 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Thu, 12 Aug 2010 19:43:51 -0600 Subject: Replace most of Net::NpcHandler with events Reviewed-by: Chuck Miller --- src/net/manaserv/npchandler.h | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) (limited to 'src/net/manaserv/npchandler.h') diff --git a/src/net/manaserv/npchandler.h b/src/net/manaserv/npchandler.h index d66c1a48..14e8a50a 100644 --- a/src/net/manaserv/npchandler.h +++ b/src/net/manaserv/npchandler.h @@ -22,6 +22,8 @@ #ifndef NET_MANASERV_NPCHANDLER_H #define NET_MANASERV_NPCHANDLER_H +#include "listener.h" + #include "net/npchandler.h" #include "net/manaserv/messagehandler.h" @@ -30,27 +32,15 @@ namespace ManaServ { -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); -- cgit v1.2.3-70-g09d2