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/npc.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/npc.cpp')
| -rw-r--r-- | src/npc.cpp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/npc.cpp b/src/npc.cpp index b3f14e8c..374e7525 100644 --- a/src/npc.cpp +++ b/src/npc.cpp @@ -29,11 +29,7 @@ #include "gui/palette.h" #include "net/net.h" -#ifdef TMWSERV_SUPPORT -#include "net/tmwserv/gameserver/player.h" -#else -#include "net/ea/npchandler.h" -#endif +#include "net/npchandler.h" #include "resources/npcdb.h" @@ -117,12 +113,7 @@ void NPC::talk() isTalking = true; - // Net::getNpcHandler()->talk(mId); -#ifdef TMWSERV_SUPPORT - Net::GameServer::Player::talkToNPC(mId, true); -#else - npcHandler->talk(mId); -#endif + Net::getNpcHandler()->talk(mId); } void NPC::updateCoords() |