diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-09-04 23:47:18 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-09-06 01:18:57 +0300 |
| commit | 8f8a9d2f1791754a1376ba9c7f010ee47d091598 (patch) | |
| tree | 3230d5f7f7584238bfbc9830c12b7a8a71b91a70 /src/net | |
| parent | 0aa42c773981f5f99e1fcd394725cd9da1e42fc1 (diff) | |
| download | manaplus-8f8a9d2f1791754a1376ba9c7f010ee47d091598.tar.gz manaplus-8f8a9d2f1791754a1376ba9c7f010ee47d091598.tar.bz2 manaplus-8f8a9d2f1791754a1376ba9c7f010ee47d091598.tar.xz manaplus-8f8a9d2f1791754a1376ba9c7f010ee47d091598.zip | |
Move processBeingSpawn from ea namespace into tmwa.
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/ea/beinghandler.cpp | 13 | ||||
| -rw-r--r-- | src/net/ea/beinghandler.h | 2 | ||||
| -rw-r--r-- | src/net/tmwa/beinghandler.cpp | 13 | ||||
| -rw-r--r-- | src/net/tmwa/beinghandler.h | 2 |
4 files changed, 15 insertions, 15 deletions
diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp index 3ad588097..3d7e4f6a7 100644 --- a/src/net/ea/beinghandler.cpp +++ b/src/net/ea/beinghandler.cpp @@ -135,19 +135,6 @@ void BeingHandler::processBeingMove2(Net::MessageIn &msg) const BLOCK_END("BeingHandler::processBeingMove2") } -void BeingHandler::processBeingSpawn(Net::MessageIn &msg) -{ - BLOCK_START("BeingHandler::processBeingSpawn") - // skipping this packet - mSpawnId = msg.readInt32("being id"); - msg.readInt16("speed"); - msg.readInt16("opt1"); - msg.readInt16("opt2"); - msg.readInt16("option"); - msg.readInt16("disguise"); - BLOCK_END("BeingHandler::processBeingSpawn") -} - void BeingHandler::processBeingRemove(Net::MessageIn &msg) const { BLOCK_START("BeingHandler::processBeingRemove") diff --git a/src/net/ea/beinghandler.h b/src/net/ea/beinghandler.h index cec1f8b35..dbe82c538 100644 --- a/src/net/ea/beinghandler.h +++ b/src/net/ea/beinghandler.h @@ -48,8 +48,6 @@ class BeingHandler notfinal : public Net::BeingHandler virtual void processBeingMove2(Net::MessageIn &msg) const; - virtual void processBeingSpawn(Net::MessageIn &msg); - virtual void processBeingRemove(Net::MessageIn &msg) const; virtual void processBeingResurrect(Net::MessageIn &msg) const; diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp index eb889146d..1d1c5ef11 100644 --- a/src/net/tmwa/beinghandler.cpp +++ b/src/net/tmwa/beinghandler.cpp @@ -975,4 +975,17 @@ void BeingHandler::processBeingVisibleOrMove(Net::MessageIn &msg) BLOCK_END("BeingHandler::processBeingVisibleOrMove") } +void BeingHandler::processBeingSpawn(Net::MessageIn &msg) +{ + BLOCK_START("BeingHandler::processBeingSpawn") + // skipping this packet + mSpawnId = msg.readInt32("being id"); + msg.readInt16("speed"); + msg.readInt16("opt1"); + msg.readInt16("opt2"); + msg.readInt16("option"); + msg.readInt16("disguise"); + BLOCK_END("BeingHandler::processBeingSpawn") +} + } // namespace TmwAthena diff --git a/src/net/tmwa/beinghandler.h b/src/net/tmwa/beinghandler.h index ae5513af0..671f2cf60 100644 --- a/src/net/tmwa/beinghandler.h +++ b/src/net/tmwa/beinghandler.h @@ -53,6 +53,8 @@ class BeingHandler final : public MessageHandler, public Ea::BeingHandler void processPlayerMoveUpdate(Net::MessageIn &msg) const; static void processBeingMove3(Net::MessageIn &msg); + + void processBeingSpawn(Net::MessageIn &msg); }; } // namespace TmwAthena |