diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-03-18 17:34:23 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-03-18 17:34:23 +0300 |
| commit | 4688d64d9881d296193b03d3dd6f5a7305bbf3a7 (patch) | |
| tree | 7fb0653434004d6cbb5d441892c98eecc31b5a3a /src/net/eathena | |
| parent | 240cf581ec7e1727097065a55a654dfdb6330ccd (diff) | |
| download | manaplus-4688d64d9881d296193b03d3dd6f5a7305bbf3a7.tar.gz manaplus-4688d64d9881d296193b03d3dd6f5a7305bbf3a7.tar.bz2 manaplus-4688d64d9881d296193b03d3dd6f5a7305bbf3a7.tar.xz manaplus-4688d64d9881d296193b03d3dd6f5a7305bbf3a7.zip | |
Move processBeingAction from ea namespace into tmwa.
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, 6 insertions, 12 deletions
diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp index beda48d15..798506991 100644 --- a/src/net/eathena/beinghandler.cpp +++ b/src/net/eathena/beinghandler.cpp @@ -77,7 +77,6 @@ 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,10 +189,6 @@ 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 +1231,12 @@ void BeingHandler::processBeingMove2(Net::MessageIn &msg) BLOCK_END("BeingHandler::processBeingMove2") } -void BeingHandler::processBeingAction2(Net::MessageIn &msg) +void BeingHandler::processBeingAction(Net::MessageIn &msg) { - BLOCK_START("BeingHandler::processBeingAction2") + BLOCK_START("BeingHandler::processBeingAction") if (!actorManager) { - BLOCK_END("BeingHandler::processBeingAction2") + BLOCK_END("BeingHandler::processBeingAction") return; } @@ -1328,7 +1323,7 @@ void BeingHandler::processBeingAction2(Net::MessageIn &msg) logger->log("type: " + toString(type)); break; } - BLOCK_END("BeingHandler::processBeingAction2") + BLOCK_END("BeingHandler::processBeingAction") } void BeingHandler::processMonsterHp(Net::MessageIn &msg) diff --git a/src/net/eathena/beinghandler.h b/src/net/eathena/beinghandler.h index 6c3df23ef..7e673a863 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 processBeingAction2(Net::MessageIn &msg); + static void processBeingAction(Net::MessageIn &msg); static void processMonsterHp(Net::MessageIn &msg); diff --git a/src/net/eathena/protocol.h b/src/net/eathena/protocol.h index 311650643..4480adf35 100644 --- a/src/net/eathena/protocol.h +++ b/src/net/eathena/protocol.h @@ -150,8 +150,7 @@ #define SMSG_BEING_SPECIAL_EFFECT_NUM 0x0284 #define SMSG_BEING_SOUND_EFFECT 0x01d3 #define SMSG_BEING_EMOTION 0x00c0 -#define SMSG_BEING_ACTION 0x008a /**< Attack, sit, stand up, ... */ -#define SMSG_BEING_ACTION2 0x02e1 +#define SMSG_BEING_ACTION 0x02e1 #define SMSG_BEING_CHAT 0x008d /**< A being talks */ #define SMSG_BEING_SLIDE 0x01ff #define SMSG_BEING_CHARM 0x08cf |