diff options
author | Andrei Karas <akaras@inbox.ru> | 2015-03-21 19:20:13 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2015-03-21 19:20:13 +0300 |
commit | f047361a2306705b85ee6074c7d47434d80fa4d3 (patch) | |
tree | 208c4972b8da2217a006759fae9d847bc0c42356 /src/net/eathena/beinghandler.cpp | |
parent | b55dc94736c2402df4e2376fd5e49966eddd6694 (diff) | |
download | manaplus-f047361a2306705b85ee6074c7d47434d80fa4d3.tar.gz manaplus-f047361a2306705b85ee6074c7d47434d80fa4d3.tar.bz2 manaplus-f047361a2306705b85ee6074c7d47434d80fa4d3.tar.xz manaplus-f047361a2306705b85ee6074c7d47434d80fa4d3.zip |
Revert "Move processBeingAction from ea namespace into tmwa."
This reverts commit 4688d64d9881d296193b03d3dd6f5a7305bbf3a7.
Diffstat (limited to 'src/net/eathena/beinghandler.cpp')
-rw-r--r-- | src/net/eathena/beinghandler.cpp | 13 |
1 files changed, 9 insertions, 4 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) |