summaryrefslogtreecommitdiff
path: root/src/game.cpp
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2009-04-06 08:12:03 -0600
committerJared Adams <jaxad0127@gmail.com>2009-04-06 08:14:37 -0600
commitffe62a721cf3c17b815da591af753e1424003a77 (patch)
tree6b3bd4dcec199ef10e138b7755d1c853db85a7d7 /src/game.cpp
parent004b2853d37a18a67c348c29e4500f3ef68337b5 (diff)
downloadmana-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/game.cpp')
-rw-r--r--src/game.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/game.cpp b/src/game.cpp
index 768b3c06..a181fc2a 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -366,7 +366,7 @@ Game::Game(Network *network):
mBeingHandler(new BeingHandler(config.getValue("EnableSync", 0) == 1)),
mAdminHandler(new EAthena::AdminHandler),
mEquipmentHandler(new EquipmentHandler),
- mSkillHandler(new SkillHandler),
+ mSkillHandler(new EAthena::SkillHandler),
#endif
mPartyHandler(new PartyHandler),
mBuySellHandler(new BuySellHandler),
@@ -380,11 +380,13 @@ Game::Game(Network *network):
mItemHandler(new ItemHandler),
#ifdef TMWSERV_SUPPORT
mNpcHandler(new TmwServ::NpcHandler),
+ mPlayerHandler(new TmwServ::PlayerHandler),
+ mTradeHandler(new TmwServ::TradeHandler),
#else
mNpcHandler(new EAthena::NpcHandler),
+ mPlayerHandler(new EAthena::PlayerHandler),
+ mTradeHandler(new EAthena::TradeHandler),
#endif
- mPlayerHandler(new PlayerHandler),
- mTradeHandler(new TradeHandler),
mLastTarget(Being::UNKNOWN),
mLogicCounterId(0), mSecondsCounterId(0)
{