diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2009-03-31 15:11:26 -0600 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2009-03-31 15:11:26 -0600 |
| commit | 37432edac65a6b85c7a3414a421f2afd3e67a14e (patch) | |
| tree | a4dc561371fab9d1800aec72960d7f86a1e88135 /src/npc.cpp | |
| parent | 2c5f308192d18b5447a5b0e2ee3428984c1f1b78 (diff) | |
| download | mana-client-37432edac65a6b85c7a3414a421f2afd3e67a14e.tar.gz mana-client-37432edac65a6b85c7a3414a421f2afd3e67a14e.tar.bz2 mana-client-37432edac65a6b85c7a3414a421f2afd3e67a14e.tar.xz mana-client-37432edac65a6b85c7a3414a421f2afd3e67a14e.zip | |
Add first draft of net handlers
eAthena NPC handler has been implemented and is being used for NPC
interraction.
Diffstat (limited to 'src/npc.cpp')
| -rw-r--r-- | src/npc.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/npc.cpp b/src/npc.cpp index 359546e2..b3f14e8c 100644 --- a/src/npc.cpp +++ b/src/npc.cpp @@ -28,11 +28,11 @@ #include "gui/npc_text.h" #include "gui/palette.h" +#include "net/net.h" #ifdef TMWSERV_SUPPORT #include "net/tmwserv/gameserver/player.h" #else -#include "net/messageout.h" -#include "net/ea/protocol.h" +#include "net/ea/npchandler.h" #endif #include "resources/npcdb.h" @@ -117,12 +117,11 @@ void NPC::talk() isTalking = true; + // Net::getNpcHandler()->talk(mId); #ifdef TMWSERV_SUPPORT Net::GameServer::Player::talkToNPC(mId, true); #else - MessageOut outMsg(CMSG_NPC_TALK); - outMsg.writeInt32(mId); - outMsg.writeInt8(0); + npcHandler->talk(mId); #endif } |