diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-09-05 12:55:45 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-09-06 01:18:57 +0300 |
commit | 946d6980c3ca3c7b7f6e50616e2e366c9adcae11 (patch) | |
tree | 9be71af99944b8056e97d83801c66222cb4dd834 | |
parent | 617feef91574c9ad6dc6dcddf910566f394c9981 (diff) | |
download | mv-946d6980c3ca3c7b7f6e50616e2e366c9adcae11.tar.gz mv-946d6980c3ca3c7b7f6e50616e2e366c9adcae11.tar.bz2 mv-946d6980c3ca3c7b7f6e50616e2e366c9adcae11.tar.xz mv-946d6980c3ca3c7b7f6e50616e2e366c9adcae11.zip |
Move processSkillCasting from ea namespace into eathena and tmwa.
-rw-r--r-- | src/net/ea/beinghandler.cpp | 11 | ||||
-rw-r--r-- | src/net/ea/beinghandler.h | 2 | ||||
-rw-r--r-- | src/net/eathena/beinghandler.cpp | 13 | ||||
-rw-r--r-- | src/net/eathena/beinghandler.h | 2 | ||||
-rw-r--r-- | src/net/tmwa/beinghandler.cpp | 13 | ||||
-rw-r--r-- | src/net/tmwa/beinghandler.h | 2 |
6 files changed, 28 insertions, 15 deletions
diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp index 1a80b2c89..606831cc3 100644 --- a/src/net/ea/beinghandler.cpp +++ b/src/net/ea/beinghandler.cpp @@ -601,17 +601,6 @@ void BeingHandler::processBeingStatusChange(Net::MessageIn &msg) const BLOCK_END("BeingHandler::processBeingStatusChange") } -void BeingHandler::processSkilCasting(Net::MessageIn &msg) const -{ - msg.readInt32("src id"); - msg.readInt32("dst id"); - msg.readInt16("dst x"); - msg.readInt16("dst y"); - msg.readInt16("skill num"); - msg.readInt32("skill get p1"); - msg.readInt32("cast time"); -} - void BeingHandler::processSkillNoDamage(Net::MessageIn &msg) const { msg.readInt16("skill id"); diff --git a/src/net/ea/beinghandler.h b/src/net/ea/beinghandler.h index dbe82c538..a2c699bc4 100644 --- a/src/net/ea/beinghandler.h +++ b/src/net/ea/beinghandler.h @@ -76,8 +76,6 @@ class BeingHandler notfinal : public Net::BeingHandler virtual void processBeingStatusChange(Net::MessageIn &msg) const; - virtual void processSkilCasting(Net::MessageIn &msg) const; - virtual void processSkillNoDamage(Net::MessageIn &msg) const; virtual void processPvpMapMode(Net::MessageIn &msg) const; diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp index f06c9fc2c..cc169fc24 100644 --- a/src/net/eathena/beinghandler.cpp +++ b/src/net/eathena/beinghandler.cpp @@ -193,7 +193,7 @@ void BeingHandler::handleMessage(Net::MessageIn &msg) break; case SMSG_SKILL_CASTING: - processSkilCasting(msg); + processSkillCasting(msg); break; case SMSG_SKILL_CAST_CANCEL: @@ -873,4 +873,15 @@ void BeingHandler::processMapTypeProperty(Net::MessageIn &msg) const msg.readInt32("flags"); } +void BeingHandler::processSkillCasting(Net::MessageIn &msg) const +{ + msg.readInt32("src id"); + msg.readInt32("dst id"); + msg.readInt16("dst x"); + msg.readInt16("dst y"); + msg.readInt16("skill num"); + msg.readInt32("skill get p1"); + msg.readInt32("cast time"); +} + } // namespace EAthena diff --git a/src/net/eathena/beinghandler.h b/src/net/eathena/beinghandler.h index 45bf1fc33..d100745f8 100644 --- a/src/net/eathena/beinghandler.h +++ b/src/net/eathena/beinghandler.h @@ -53,6 +53,8 @@ class BeingHandler final : public MessageHandler, public Ea::BeingHandler void processPlayerMoveUpdate(Net::MessageIn &msg) const; void processMapTypeProperty(Net::MessageIn &msg) const; + + void processSkillCasting(Net::MessageIn &msg) const; }; } // namespace EAthena diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp index 1d1c5ef11..af71491d3 100644 --- a/src/net/tmwa/beinghandler.cpp +++ b/src/net/tmwa/beinghandler.cpp @@ -203,7 +203,7 @@ void BeingHandler::handleMessage(Net::MessageIn &msg) break; case SMSG_SKILL_CASTING: - processSkilCasting(msg); + processSkillCasting(msg); break; case SMSG_SKILL_CAST_CANCEL: @@ -988,4 +988,15 @@ void BeingHandler::processBeingSpawn(Net::MessageIn &msg) BLOCK_END("BeingHandler::processBeingSpawn") } +void BeingHandler::processSkillCasting(Net::MessageIn &msg) const +{ + msg.readInt32("src id"); + msg.readInt32("dst id"); + msg.readInt16("dst x"); + msg.readInt16("dst y"); + msg.readInt16("skill num"); + msg.readInt32("skill get p1"); + msg.readInt32("cast time"); +} + } // namespace TmwAthena diff --git a/src/net/tmwa/beinghandler.h b/src/net/tmwa/beinghandler.h index 671f2cf60..fb7fd872d 100644 --- a/src/net/tmwa/beinghandler.h +++ b/src/net/tmwa/beinghandler.h @@ -55,6 +55,8 @@ class BeingHandler final : public MessageHandler, public Ea::BeingHandler static void processBeingMove3(Net::MessageIn &msg); void processBeingSpawn(Net::MessageIn &msg); + + void processSkillCasting(Net::MessageIn &msg) const; }; } // namespace TmwAthena |