diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2009-04-06 08:12:03 -0600 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2009-04-06 08:14:37 -0600 |
| commit | ffe62a721cf3c17b815da591af753e1424003a77 (patch) | |
| tree | 6b3bd4dcec199ef10e138b7755d1c853db85a7d7 /src/net/net.cpp | |
| parent | 004b2853d37a18a67c348c29e4500f3ef68337b5 (diff) | |
| download | mana-ffe62a721cf3c17b815da591af753e1424003a77.tar.gz mana-ffe62a721cf3c17b815da591af753e1424003a77.tar.bz2 mana-ffe62a721cf3c17b815da591af753e1424003a77.tar.xz mana-ffe62a721cf3c17b815da591af753e1424003a77.zip | |
Add TMWServ's SkillHandler
Also namespace both Player- and TradeHandlers
Diffstat (limited to 'src/net/net.cpp')
| -rw-r--r-- | src/net/net.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/net/net.cpp b/src/net/net.cpp index 255b6ab9..b2fe7225 100644 --- a/src/net/net.cpp +++ b/src/net/net.cpp @@ -40,25 +40,26 @@ #include "net/tmwserv/inventoryhandler.h" #include "net/tmwserv/maphandler.h" #include "net/tmwserv/npchandler.h" +#include "net/tmwserv/playerhandler.h" +#include "net/tmwserv/skillhandler.h" +#include "net/tmwserv/tradehandler.h" #include "net/ea/adminhandler.h" #include "net/ea/inventoryhandler.h" #include "net/ea/maphandler.h" #include "net/ea/npchandler.h" - -#ifdef TMWSERV_SUPPORT -#include "net/tmwserv/playerhandler.h" -#include "net/tmwserv/tradehandler.h" -#else #include "net/ea/playerhandler.h" +#include "net/ea/skillhandler.h" #include "net/ea/tradehandler.h" -#endif extern Net::AdminHandler *adminHandler; extern Net::ChatHandler *chatHandler; extern Net::InventoryHandler *inventoryHandler; extern Net::MapHandler *mapHandler; extern Net::NpcHandler *npcHandler; +extern Net::PlayerHandler *playerHandler; +extern Net::SkillHandler *skillHandler; +extern Net::TradeHandler *tradeHandler; Net::AdminHandler *Net::getAdminHandler() { @@ -122,8 +123,7 @@ Net::PlayerHandler *Net::getPlayerHandler() Net::SkillHandler *Net::getSkillHandler() { - // TODO - return 0; + return skillHandler; } Net::TradeHandler *Net::getTradeHandler() |