diff options
Diffstat (limited to 'src/net/eathena')
| -rw-r--r-- | src/net/eathena/beinghandler.cpp | 13 | ||||
| -rw-r--r-- | src/net/eathena/beinghandler.h | 2 | ||||
| -rw-r--r-- | src/net/eathena/protocol.h | 3 |
3 files changed, 12 insertions, 6 deletions
diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp index 74dabe61a..d6ede2d36 100644 --- a/src/net/eathena/beinghandler.cpp +++ b/src/net/eathena/beinghandler.cpp @@ -77,6 +77,7 @@ BeingHandler::BeingHandler(const bool enableSync) : SMSG_BEING_REMOVE_SKILL, SMSG_SKILL_DAMAGE, SMSG_BEING_ACTION, + SMSG_BEING_ACTION2, SMSG_BEING_SELFEFFECT, SMSG_BEING_SPECIAL_EFFECT, SMSG_BEING_SPECIAL_EFFECT_NUM, @@ -190,6 +191,10 @@ void BeingHandler::handleMessage(Net::MessageIn &msg) processBeingAction(msg); break; + case SMSG_BEING_ACTION2: + processBeingAction2(msg); + break; + case SMSG_BEING_SELFEFFECT: processBeingSelfEffect(msg); break; @@ -1236,12 +1241,12 @@ void BeingHandler::processBeingMove2(Net::MessageIn &msg) BLOCK_END("BeingHandler::processBeingMove2") } -void BeingHandler::processBeingAction(Net::MessageIn &msg) +void BeingHandler::processBeingAction2(Net::MessageIn &msg) { - BLOCK_START("BeingHandler::processBeingAction") + BLOCK_START("BeingHandler::processBeingAction2") if (!actorManager) { - BLOCK_END("BeingHandler::processBeingAction") + BLOCK_END("BeingHandler::processBeingAction2") return; } @@ -1328,7 +1333,7 @@ void BeingHandler::processBeingAction(Net::MessageIn &msg) logger->log("type: " + toString(type)); break; } - BLOCK_END("BeingHandler::processBeingAction") + BLOCK_END("BeingHandler::processBeingAction2") } void BeingHandler::processMonsterHp(Net::MessageIn &msg) diff --git a/src/net/eathena/beinghandler.h b/src/net/eathena/beinghandler.h index 6acafb931..78f12af80 100644 --- a/src/net/eathena/beinghandler.h +++ b/src/net/eathena/beinghandler.h @@ -71,7 +71,7 @@ class BeingHandler final : public MessageHandler, public Ea::BeingHandler static void processBeingMove2(Net::MessageIn &msg); - static void processBeingAction(Net::MessageIn &msg); + static void processBeingAction2(Net::MessageIn &msg); static void processMonsterHp(Net::MessageIn &msg); diff --git a/src/net/eathena/protocol.h b/src/net/eathena/protocol.h index 2cc614d3b..b8667be22 100644 --- a/src/net/eathena/protocol.h +++ b/src/net/eathena/protocol.h @@ -151,7 +151,8 @@ #define SMSG_BEING_SPECIAL_EFFECT_NUM 0x0284 #define SMSG_BEING_SOUND_EFFECT 0x01d3 #define SMSG_BEING_EMOTION 0x00c0 -#define SMSG_BEING_ACTION 0x02e1 +#define SMSG_BEING_ACTION 0x008a /**< Attack, sit, stand up, ... */ +#define SMSG_BEING_ACTION2 0x02e1 #define SMSG_BEING_CHAT 0x008d /**< A being talks */ #define SMSG_BEING_SLIDE 0x01ff #define SMSG_BEING_CHARM 0x08cf |