diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2009-04-05 19:17:33 -0600 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2009-04-05 19:17:33 -0600 |
| commit | a0c7d1f61783e77e552896824855377e4bb43f8d (patch) | |
| tree | e952181b83482abeffbd8ad9c62789b8f72e42e5 /src/net/ea | |
| parent | 9113afb868f6c1da5911437d3ddabdcf169cbec2 (diff) | |
| download | mana-a0c7d1f61783e77e552896824855377e4bb43f8d.tar.gz mana-a0c7d1f61783e77e552896824855377e4bb43f8d.tar.bz2 mana-a0c7d1f61783e77e552896824855377e4bb43f8d.tar.xz mana-a0c7d1f61783e77e552896824855377e4bb43f8d.zip | |
Implement TMWServ's NpcHandler
Diffstat (limited to 'src/net/ea')
| -rw-r--r-- | src/net/ea/inventoryhandler.cpp | 4 | ||||
| -rw-r--r-- | src/net/ea/npchandler.cpp | 6 | ||||
| -rw-r--r-- | src/net/ea/npchandler.h | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp index e6658bbf..b4d05de2 100644 --- a/src/net/ea/inventoryhandler.cpp +++ b/src/net/ea/inventoryhandler.cpp @@ -45,12 +45,12 @@ #include <SDL_types.h> +Net::InventoryHandler *inventoryHandler; + namespace EAthena { enum { debugInventory = 1 }; -InventoryHandler *inventoryHandler; - InventoryHandler::InventoryHandler() { static const Uint16 _messages[] = { diff --git a/src/net/ea/npchandler.cpp b/src/net/ea/npchandler.cpp index 33e478cb..05313798 100644 --- a/src/net/ea/npchandler.cpp +++ b/src/net/ea/npchandler.cpp @@ -39,7 +39,9 @@ #include <SDL_types.h> -NpcHandler *npcHandler; +Net::NpcHandler *npcHandler; + +namespace EAthena { NpcHandler::NpcHandler() { @@ -208,3 +210,5 @@ void NpcHandler::endShopping(int beingId) { // TODO } + +} // namespace EAthena diff --git a/src/net/ea/npchandler.h b/src/net/ea/npchandler.h index 9ca83f11..557b97d9 100644 --- a/src/net/ea/npchandler.h +++ b/src/net/ea/npchandler.h @@ -26,6 +26,8 @@ #include "net/net.h" #include "net/npchandler.h" +namespace EAthena { + class NpcHandler : public MessageHandler, public Net::NpcHandler { public: @@ -61,6 +63,6 @@ class NpcHandler : public MessageHandler, public Net::NpcHandler void endShopping(int beingId); }; -extern NpcHandler *npcHandler; +} // namespace EAthena #endif // NET_EA_NPCHANDLER_H |