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/net.cpp | |
| 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/net.cpp')
| -rw-r--r-- | src/net/net.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/net/net.cpp b/src/net/net.cpp index 8921a954..2d894119 100644 --- a/src/net/net.cpp +++ b/src/net/net.cpp @@ -36,7 +36,9 @@ #include "net/tradehandler.h" #include "net/tmwserv/inventoryhandler.h" +#include "net/tmwserv/npchandler.h" #include "net/ea/inventoryhandler.h" +#include "net/ea/npchandler.h" #ifdef TMWSERV_SUPPORT #include "net/tmwserv/playerhandler.h" @@ -46,9 +48,8 @@ #include "net/ea/tradehandler.h" #endif -namespace EAthena { -extern InventoryHandler *inventoryHandler; -} +extern Net::InventoryHandler *inventoryHandler; +extern Net::NpcHandler *npcHandler; Net::AdminHandler *Net::getAdminHandler() { @@ -82,11 +83,7 @@ Net::GuildHandler *Net::getGuildHandler() Net::InventoryHandler *Net::getInventoryHandler() { -#ifdef TMWSERV_SUPPORT - return TmwServ::inventoryHandler; -#else - return EAthena::inventoryHandler; -#endif + return inventoryHandler; } Net::LoginHandler *Net::getLoginHandler() @@ -103,8 +100,7 @@ Net::MapHandler *Net::getMapHandler() Net::NpcHandler *Net::getNpcHandler() { - // TODO - return 0; + return npcHandler; } Net::PartyHandler *Net::getPartyHandler() |