diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-06-30 14:37:49 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-07-01 17:51:01 +0300 |
| commit | c01aec243610016c2cd5e4211fee484627bc69ea (patch) | |
| tree | 46a0b704701a9c1229fafa5e7ed7117002fc1579 /src/net/tmwa | |
| parent | 8321043b76660235a5ebbfbb8f43504f43c1af8b (diff) | |
| download | plus-c01aec243610016c2cd5e4211fee484627bc69ea.tar.gz plus-c01aec243610016c2cd5e4211fee484627bc69ea.tar.bz2 plus-c01aec243610016c2cd5e4211fee484627bc69ea.tar.xz plus-c01aec243610016c2cd5e4211fee484627bc69ea.zip | |
Add npc avatars for evol server.
Change protocol version to 6.
Diffstat (limited to 'src/net/tmwa')
| -rw-r--r-- | src/net/tmwa/network.h | 4 | ||||
| -rw-r--r-- | src/net/tmwa/npchandler.cpp | 19 |
2 files changed, 19 insertions, 4 deletions
diff --git a/src/net/tmwa/network.h b/src/net/tmwa/network.h index 2dc91e509..03f24839b 100644 --- a/src/net/tmwa/network.h +++ b/src/net/tmwa/network.h @@ -39,8 +39,8 @@ * Protocol version, reported to the eAthena char and mapserver who can adjust * the protocol accordingly. */ -#define CLIENT_PROTOCOL_VERSION 5 -#define CLIENT_TMW_PROTOCOL_VERSION 1 +#define CLIENT_PROTOCOL_VERSION 6 +#define CLIENT_TMW_PROTOCOL_VERSION 1 namespace TmwAthena { diff --git a/src/net/tmwa/npchandler.cpp b/src/net/tmwa/npchandler.cpp index ec3ef48b8..be58f0bc5 100644 --- a/src/net/tmwa/npchandler.cpp +++ b/src/net/tmwa/npchandler.cpp @@ -290,10 +290,25 @@ void NpcHandler::processNpcCommand(Net::MessageIn &msg, int npcId) viewport->moveCameraRelative(x, y); } break; - case 5: + case 5: // close dialog closeDialog(npcId); break; - + case 6: // show avatar + if (mDialog) + mDialog->showAvatar(msg.readInt32()); // avatar id + break; + case 7: // set avatar direction + if (mDialog) + { + mDialog->setAvatarDirection( + Net::MessageIn::fromServerDirection( + msg.readInt32())); // direction + } + break; + case 8: // set avatar action + if (mDialog) + mDialog->setAvatarAction(msg.readInt32()); // direction + break; default: logger->log("unknown npc command: %d", cmd); break; |