summaryrefslogtreecommitdiff
path: root/src/net/manaserv/npchandler.h
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2009-11-03 10:18:25 -0700
committerJared Adams <jaxad0127@gmail.com>2009-11-03 10:18:25 -0700
commitacd557f9472c711fe92b9c158ec336abf688bf7b (patch)
tree2295d13589411ee88afe16f4997bea65b4ebba94 /src/net/manaserv/npchandler.h
parentc60d3a98dbbb20621742bfd82bbaaa6b7085a8ae (diff)
downloadmana-acd557f9472c711fe92b9c158ec336abf688bf7b.tar.gz
mana-acd557f9472c711fe92b9c158ec336abf688bf7b.tar.bz2
mana-acd557f9472c711fe92b9c158ec336abf688bf7b.tar.xz
mana-acd557f9472c711fe92b9c158ec336abf688bf7b.zip
Remove more _SUPPORT ifdefs and do some cleanup
Diffstat (limited to 'src/net/manaserv/npchandler.h')
-rw-r--r--src/net/manaserv/npchandler.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/net/manaserv/npchandler.h b/src/net/manaserv/npchandler.h
index bc0aaee1..b1912ce3 100644
--- a/src/net/manaserv/npchandler.h
+++ b/src/net/manaserv/npchandler.h
@@ -22,9 +22,10 @@
#ifndef NET_MANASERV_NPCHANDLER_H
#define NET_MANASERV_NPCHANDLER_H
-#include "net/messagehandler.h"
#include "net/npchandler.h"
+#include "net/manaserv/messagehandler.h"
+
#include <list>
namespace ManaServ {
@@ -34,7 +35,7 @@ class NpcHandler : public MessageHandler, public Net::NpcHandler
public:
NpcHandler();
- void handleMessage(MessageIn &msg);
+ void handleMessage(Net::MessageIn &msg);
void talk(int npcId);
@@ -66,4 +67,4 @@ class NpcHandler : public MessageHandler, public Net::NpcHandler
} // namespace ManaServ
-#endif
+#endif // NET_MANASERV_NPCHANDLER_H