diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-08-30 17:35:30 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-08-30 17:35:30 +0300 |
| commit | 5ecad5ededdeace6024d8bcd59681677cf4953e1 (patch) | |
| tree | e502bbc75784b8b025bddaac55cb2804606b1ed2 /src/net/tmwa | |
| parent | 4d03a4b3e2c1a6571f41e75239d6767dcf44e918 (diff) | |
| download | mv-5ecad5ededdeace6024d8bcd59681677cf4953e1.tar.gz mv-5ecad5ededdeace6024d8bcd59681677cf4953e1.tar.bz2 mv-5ecad5ededdeace6024d8bcd59681677cf4953e1.tar.xz mv-5ecad5ededdeace6024d8bcd59681677cf4953e1.zip | |
Remove additional parameters from processPlayerMoveUpdate function.
Diffstat (limited to 'src/net/tmwa')
| -rw-r--r-- | src/net/tmwa/beinghandler.cpp | 38 | ||||
| -rw-r--r-- | src/net/tmwa/beinghandler.h | 3 |
2 files changed, 20 insertions, 21 deletions
diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp index b66ad64be..0687c8e17 100644 --- a/src/net/tmwa/beinghandler.cpp +++ b/src/net/tmwa/beinghandler.cpp @@ -183,24 +183,9 @@ void BeingHandler::handleMessage(Net::MessageIn &msg) case SMSG_PLAYER_UPDATE_1: case SMSG_PLAYER_UPDATE_2: case SMSG_PLAYER_MOVE: - int type; - switch (msg.getId()) - { - case SMSG_PLAYER_UPDATE_1: - type = 1; - break; - case SMSG_PLAYER_UPDATE_2: - type = 2; - break; - case SMSG_PLAYER_MOVE: - type = 3; - break; - default: - return; - } - processPlayerMoveUpdate(msg, type); - + processPlayerMoveUpdate(msg); break; + case SMSG_PLAYER_STOP: processPlayerStop(msg); break; @@ -453,8 +438,7 @@ void BeingHandler::processNameResponse2(Net::MessageIn &msg) BLOCK_END("BeingHandler::processNameResponse2") } -void BeingHandler::processPlayerMoveUpdate(Net::MessageIn &msg, - const int msgType) const +void BeingHandler::processPlayerMoveUpdate(Net::MessageIn &msg) const { BLOCK_START("BeingHandler::processPlayerMoveUpdate") if (!actorManager || !localPlayer) @@ -463,6 +447,22 @@ void BeingHandler::processPlayerMoveUpdate(Net::MessageIn &msg, return; } + int msgType; + switch (msg.getId()) + { + case SMSG_PLAYER_UPDATE_1: + msgType = 1; + break; + case SMSG_PLAYER_UPDATE_2: + msgType = 2; + break; + case SMSG_PLAYER_MOVE: + msgType = 3; + break; + default: + return; + } + // An update about a player, potentially including movement. const int id = msg.readInt32(); const int16_t speed = msg.readInt16(); diff --git a/src/net/tmwa/beinghandler.h b/src/net/tmwa/beinghandler.h index 235b4da9d..ae5513af0 100644 --- a/src/net/tmwa/beinghandler.h +++ b/src/net/tmwa/beinghandler.h @@ -50,8 +50,7 @@ class BeingHandler final : public MessageHandler, public Ea::BeingHandler static void processNameResponse2(Net::MessageIn &msg); - void processPlayerMoveUpdate(Net::MessageIn &msg, - const int type) const; + void processPlayerMoveUpdate(Net::MessageIn &msg) const; static void processBeingMove3(Net::MessageIn &msg); }; |